container.hpp   container.hpp 
skipping to change at line 97 skipping to change at line 97
* container will not itself nor will it draw it's content. * container will not itself nor will it draw it's content.
* *
* @param opaque True if the container should be opaque, false othe rwise. * @param opaque True if the container should be opaque, false othe rwise.
* @see isOpaque * @see isOpaque
*/ */
void setOpaque(bool opaque); void setOpaque(bool opaque);
/** /**
* Checks if the container is opaque or not. * Checks if the container is opaque or not.
* *
* @return true if the container is opaque, false otherwise. * @return True if the container is opaque, false otherwise.
* @see setOpaque * @see setOpaque
*/ */
bool isOpaque() const; bool isOpaque() const;
/** /**
* Adds a widget to the container. * Adds a widget to the container.
* *
* @param widget The widget to add. * @param widget The widget to add.
* @see remove, clear * @see remove, clear
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 key.hpp   key.hpp 
skipping to change at line 49 skipping to change at line 49
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef GCN_KEY_HPP #ifndef GCN_KEY_HPP
#define GCN_KEY_HPP #define GCN_KEY_HPP
#include "guichan/platform.hpp" #include "guichan/platform.hpp"
// windows.h defines DELETE which breaks this file as we have a constant na
med
// DELETE, hence we undefine DELETE if it is defined and hope people don't
use
// that windows define with Guichan.
#if defined (_WIN32) && defined(DELETE)
#undef DELETE
#endif
namespace gcn namespace gcn
{ {
/** /**
* Represents a key or a character. * Represents a key or a character.
*/ */
class GCN_CORE_DECLSPEC Key class GCN_CORE_DECLSPEC Key
{ {
public: public:
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 openglallegroimageloader.hpp   openglallegroimageloader.hpp 
skipping to change at line 49 skipping to change at line 49
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef GCN_OPENGLALLEGROIMAGELOADER_HPP #ifndef GCN_OPENGLALLEGROIMAGELOADER_HPP
#define GCN_OPENGLALLEGROIMAGELOADER_HPP #define GCN_OPENGLALLEGROIMAGELOADER_HPP
#include <allegro.h> #include <allegro.h>
#include <alleggl.h> #include <alleggl.h>
#if defined (_WIN32)
// Sometimes windows.h defines DELETE which causes a compilation
// error in a Guichan header.
#if defined (DELETE)
#undef DELETE
#endif
#endif
#include <guichan/imageloader.hpp> #include <guichan/imageloader.hpp>
#include <guichan/exception.hpp> #include <guichan/exception.hpp>
#include <guichan/opengl/openglimage.hpp> #include <guichan/opengl/openglimage.hpp>
namespace gcn namespace gcn
{ {
/** /**
* OpenGL ImageLoader that loads images with Allegro. * OpenGL ImageLoader that loads images with Allegro.
*/ */
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 openglimage.hpp   openglimage.hpp 
skipping to change at line 50 skipping to change at line 50
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef GCN_OPENGLIMAGE_HPP #ifndef GCN_OPENGLIMAGE_HPP
#define GCN_OPENGLIMAGE_HPP #define GCN_OPENGLIMAGE_HPP
#if defined (_WIN32) #if defined (_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#if defined (DELETE)
#undef DELETE
#endif
#endif #endif
#if defined (__amigaos4__) #if defined (__amigaos4__)
#include <mgl/gl.h> #include <mgl/gl.h>
#elif defined (__APPLE__) #elif defined (__APPLE__)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#else #else
#include <GL/gl.h> #include <GL/gl.h>
#endif #endif
 End of changes. 1 change blocks. 
3 lines changed or deleted 0 lines changed or added


 scrollarea.hpp   scrollarea.hpp 
skipping to change at line 310 skipping to change at line 310
/** /**
* Gets the amount to scroll in pixels when the down scroll button is * Gets the amount to scroll in pixels when the down scroll button is
* pushed. * pushed.
* *
* @return The amount to scroll in pixels. * @return The amount to scroll in pixels.
* @see setDownButtonScrollAmount * @see setDownButtonScrollAmount
*/ */
int getDownButtonScrollAmount() const; int getDownButtonScrollAmount() const;
/**
* Sets the scroll area to be opaque, that is sets the scoll area
* to display its background.
*
* @param opaque True if the scoll area should be opaque, false oth
erwise.
*/
void setOpaque(bool opaque);
/**
* Checks if the scroll area is opaque, that is if the scroll area
* displays its background.
*
* @return True if the scroll area is opaque, false otherwise.
*/
bool isOpaque() const;
// Inherited from BasicContainer // Inherited from BasicContainer
virtual void showWidgetPart(Widget* widget, Rectangle area); virtual void showWidgetPart(Widget* widget, Rectangle area);
virtual Rectangle getChildrenArea(); virtual Rectangle getChildrenArea();
virtual Widget *getWidgetAt(int x, int y); virtual Widget *getWidgetAt(int x, int y);
// Inherited from Widget // Inherited from Widget
skipping to change at line 562 skipping to change at line 578
/** /**
* Holds the horizontal markers drag offset. * Holds the horizontal markers drag offset.
*/ */
int mHorizontalMarkerDragOffset; int mHorizontalMarkerDragOffset;
/** /**
* Holds the vertical markers drag offset. * Holds the vertical markers drag offset.
*/ */
int mVerticalMarkerDragOffset; int mVerticalMarkerDragOffset;
/**
* True if the scroll area should be opaque (that is
* display its background), false otherwise.
*/
bool mOpaque;
}; };
} }
#endif // end GCN_SCROLLAREA_HPP #endif // end GCN_SCROLLAREA_HPP
 End of changes. 2 change blocks. 
0 lines changed or deleted 23 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/