set eol-style

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

diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h
index 0f5b073554b77ff3d81948f23a3bebc7162f449a..ab6806b3e912d56c375da0fe9c652fb5598396b8 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;


@@ -38,9 +38,8 @@ public:
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
     wxBitmap(const wxImage& image, int depth = -1);
     virtual ~wxBitmap() {}
     wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE);
     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 Ok() const { return IsOk(); }
+    bool IsOk() const;

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