no changes, just remove #if'd out code

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

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 0f5b073554b77ff3d81948f23a3bebc7162f449a..f6392e5f8cdbd01d4b7f944d2bcc9273cfce5a28 100644 (file)
--- a/include/wx/mgl/bitmap.h
+++ b/include/wx/mgl/bitmap.h
@@ -13,8 +13,8 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDC;
-class WXDLLEXPORT wxMemoryDC;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+class WXDLLIMPEXP_FWD_CORE wxMemoryDC;

 
 class MGLDevCtx;
 struct bitmap_t;
 
 class MGLDevCtx;
 struct bitmap_t;


@@ -23,26 +23,23 @@ struct bitmap_t;
 // wxBitmap
 //-----------------------------------------------------------------------------
 
 // wxBitmap
 //-----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
-{
-    DECLARE_ABSTRACT_CLASS(wxBitmapHandler)
-};
-
-class WXDLLEXPORT wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase

 {
 public:
     wxBitmap() {}
 {
 public:
     wxBitmap() {}

-    wxBitmap(int width, int height, int depth = -1);
+    wxBitmap(int width, int height, int depth = -1)
+        { Create(width, height, depth); }
+    wxBitmap(const wxSize& sz, int depth = -1)
+        { Create(sz, depth); }

     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char* const* bits);
     wxBitmap(const char bits[], int width, int height, int depth = 1);
     wxBitmap(const char* const* bits);

-    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
+    wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

     wxBitmap(const wxImage& image, int depth = -1);
     virtual ~wxBitmap() {}
     wxBitmap(const wxImage& image, int depth = -1);
     virtual ~wxBitmap() {}

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

 
 

-    bool Create(int width, int height, int depth = -1);
+    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
+    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
+        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }

 
     virtual int GetHeight() const;
     virtual int GetWidth() const;
 
     virtual int GetHeight() const;
     virtual int GetWidth() const;


@@ -55,8 +52,8 @@ public:
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 
 
     virtual wxBitmap GetSubBitmap(const wxRect& rect) const;
 

-    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const;
-    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
+    virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = NULL) const;
+    virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);

 
     virtual wxPalette *GetPalette() const;
     virtual void SetPalette(const wxPalette& palette);
 
     virtual wxPalette *GetPalette() const;
     virtual void SetPalette(const wxPalette& palette);


@@ -77,6 +74,9 @@ public:
     bitmap_t *GetMGLbitmap_t() const;
 
 protected:
     bitmap_t *GetMGLbitmap_t() const;
 
 protected:

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

     // creates temporary DC for access to bitmap's data:
     MGLDevCtx *CreateTmpDC() const;
     // sets fg & bg colours for 1bit bitmaps:
     // creates temporary DC for access to bitmap's data:
     MGLDevCtx *CreateTmpDC() const;
     // sets fg & bg colours for 1bit bitmaps: