wxLaunchDefaultBrowser() now supports wxBROWSER_NEW_WINDOW flag (and it actually...

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

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index c9d96ad944865b414dce934c41871be6b0e2c76e..ad4f10e9e0040f82d81cefb07a9e5e6015379802 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 

-#ifdef __GNUG__
-#pragma interface "bitmap.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"


@@ -26,15 +22,15 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

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

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

-class wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject

 {
 public:
     wxMask();
 {
 public:
     wxMask();


@@ -74,7 +70,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 
     DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
 };
 

-class wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase

 {
 public:
     wxBitmap();
 {
 public:
     wxBitmap();


@@ -96,6 +92,8 @@ public:
     bool Create(int width, int height, int depth = -1);
     bool Create(void* data, wxBitmapType type,
                 int width, int height, int depth = -1);
     bool Create(int width, int height, int depth = -1);
     bool Create(void* data, wxBitmapType type,
                 int width, int height, int depth = -1);

+    // create the wxBitmap using a _copy_ of the pixmap
+    bool Create(WXPixmap pixmap);

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