Added DoLoadFile, DoSaveFile to wxTextCtrlBase

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 28428007674519cd8d3ead527500a8cd3563c5c4..50fa1d12716c1eeee92a38d28b79e99b1ad34e9c 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BITMAP_H_
 #define _WX_BITMAP_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "bitmap.h"
-#endif
-
 #include "wx/msw/gdiimage.h"
 #include "wx/gdicmn.h"
 #include "wx/palette.h"
@@ -43,17 +39,14 @@ class WXDLLEXPORT wxBitmap : public wxGDIImage
 {
 public:
     // default ctor creates an invalid bitmap, you must Create() it later
-    wxBitmap();
-
-    // Copy constructors
-    wxBitmap(const wxBitmap& bitmap);
+    wxBitmap() { }
 
     // Initialize with raw data
     wxBitmap(const char bits[], int width, int height, int depth = 1);
 
     // Initialize with XPM data
-    wxBitmap(const char **data);
-    wxBitmap(char **data);
+    wxBitmap(const char **data) { CreateFromXpm(data); }
+    wxBitmap(char **data) { CreateFromXpm((const char **)data); }
 
     // Load a file or resource
     wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_BMP_RESOURCE);
@@ -72,25 +65,18 @@ public:
     wxBitmap(int width, int height, const wxDC& dc);
 
 #if wxUSE_IMAGE
-
     // Convert from wxImage
-    wxBitmap(const wxImage& image, int depth = -1);
+    wxBitmap(const wxImage& image, int depth = -1)
+        { (void)CreateFromImage(image, depth); }
 
     // Create a DDB compatible with the given DC from wxImage
-    wxBitmap(const wxImage& image, const wxDC& dc);
-
+    wxBitmap(const wxImage& image, const wxDC& dc)
+        { (void)CreateFromImage(image, dc); }
 #endif // wxUSE_IMAGE
 
     // we must have this, otherwise icons are silently copied into bitmaps using
     // the copy ctor but the resulting bitmap is invalid!
-    wxBitmap(const wxIcon& icon);
-
-    wxBitmap& operator=(const wxBitmap& bitmap)
-    {
-        if ( m_refData != bitmap.m_refData )
-            Ref(bitmap);
-        return *this;
-    }
+    wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
 
     wxBitmap& operator=(const wxIcon& icon)
     {
@@ -145,6 +131,7 @@ public:
 #endif // wxUSE_PALETTE
 
     wxMask *GetMask() const;
+    wxBitmap GetMaskBitmap() const;
     void SetMask(wxMask *mask);
 
     bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
@@ -175,10 +162,8 @@ public:
 #endif // __WXDEBUG__
 
 protected:
-    // common part of all ctors
-    void Init();
-
     virtual wxGDIImageRefData *CreateData() const;
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     // creates the bitmap from XPM data, supposed to be called from ctor
     bool CreateFromXpm(const char **bits);
@@ -198,10 +183,9 @@ protected:
 #endif // wxUSE_IMAGE
 
 private:
-#ifdef __WIN32__
     // common part of CopyFromIcon/CopyFromCursor for Win32
     bool CopyFromIconOrCursor(const wxGDIImage& icon);
-#endif // __WIN32__
+
 
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };