fix the wrong #ifdef WXWIN_COMPATIBILITY_2_8 checks, #if should be used (#9644)

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 5a3ab7be0b76d18f4fc2814c70a472b508fae647..4ad700eb11b8892c710e933bcc5065bd7345969e 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -22,9 +22,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxMask;
-class WXDLLIMPEXP_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxImage;
+class WXDLLIMPEXP_FWD_CORE wxMask;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxImage;

 
 //-----------------------------------------------------------------------------
 // wxMask
 
 //-----------------------------------------------------------------------------
 // wxMask


@@ -62,11 +62,6 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
-    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
-

 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
 class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:


@@ -74,7 +69,7 @@ public:
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
     wxBitmap( const char* const* bits );

-#if defined (__GNUC__) && __GNUC__ < 3
+#ifdef wxNEEDS_CHARPP

     // needed for old GCC
     wxBitmap(char** data)
     {
     // needed for old GCC
     wxBitmap(char** data)
     {


@@ -84,9 +79,6 @@ public:
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();
 
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
     virtual ~wxBitmap();
 

-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-

     static void InitStandardHandlers();
 
     bool Create(int width, int height, int depth = -1);
     static void InitStandardHandlers();
 
     bool Create(int width, int height, int depth = -1);


@@ -137,9 +129,12 @@ public:
 
     WXDisplay *GetDisplay() const;
 
 
     WXDisplay *GetDisplay() const;
 

+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };
 

-#endif
-// _WX_BITMAP_H_
+#endif // _WX_BITMAP_H_