Fix scrolling bug where client size was reported wrong

[wxWidgets.git] / include / wx / bitmap.h

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 357c5636856495ca2a371742f1fa576affd67bdc..7d688bc7886b823b81173f8cfb38520e4349d0ae 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -16,10 +16,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "bitmapbase.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -33,7 +29,9 @@ class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxPalette;
 
 #if defined(__WXMGL__) || \
 class WXDLLEXPORT wxPalette;
 
 #if defined(__WXMGL__) || \

+    defined(__WXDFB__) || \

     defined(__WXMAC__) || \
     defined(__WXMAC__) || \

+    defined(__WXGTK__) || \

     defined(__WXCOCOA__) || \
     defined(__WXMOTIF__) || \
     defined(__WXX11__)
     defined(__WXCOCOA__) || \
     defined(__WXMOTIF__) || \
     defined(__WXX11__)


@@ -63,27 +61,25 @@ public:
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
                           int type, const wxPalette *palette = NULL) = 0;
 
     virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name,
                           int type, const wxPalette *palette = NULL) = 0;
 

-    void SetName(const wxString& name) { m_name = name; }
-    void SetExtension(const wxString& ext) { m_extension = ext; }
-    void SetType(wxBitmapType type) { m_type = type; }
-    wxString GetName() const { return m_name; }
-    wxString GetExtension() const { return m_extension; }
-    wxBitmapType GetType() const { return m_type; }
+    void SetName(const wxString& name)      { m_name = name; }
+    void SetExtension(const wxString& ext)  { m_extension = ext; }
+    void SetType(wxBitmapType type)         { m_type = type; }
+    wxString GetName() const                { return m_name; }
+    wxString GetExtension() const           { return m_extension; }
+    wxBitmapType GetType() const            { return m_type; }

 
 

-protected:
+private:

     wxString      m_name;
     wxString      m_extension;
     wxBitmapType  m_type;
 
     wxString      m_name;
     wxString      m_extension;
     wxBitmapType  m_type;
 

+private:

     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:
     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:

-    wxBitmapBase() : wxGDIObject() {}
-    virtual ~wxBitmapBase() {}
-

     /*
     Derived class must implement these:
 
     /*
     Derived class must implement these:
 


@@ -92,10 +88,8 @@ public:
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits);
     wxBitmap(char **bits);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char **bits);
     wxBitmap(char **bits);

-    wxBitmap(const wxBitmap& bmp);

     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM);
     wxBitmap(const wxImage& image, int depth = -1);

-    wxBitmap& operator = (const wxBitmap& bmp);

     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;
 
     bool operator == (const wxBitmap& bmp) const;
     bool operator != (const wxBitmap& bmp) const;
 


@@ -169,12 +163,16 @@ protected:
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/bitmap.h"
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
 #include "wx/x11/bitmap.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

 #include "wx/gtk/bitmap.h"
 #include "wx/gtk/bitmap.h"

+#elif defined(__WXGTK__)
+#include "wx/gtk1/bitmap.h"

 #elif defined(__WXX11__)
 #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
 #elif defined(__WXX11__)
 #include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"

+#elif defined(__WXDFB__)
+#include "wx/dfb/bitmap.h"

 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXCOCOA__)