wxDataObejct and related changes (won't compile right now)

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 46c1c5b951bd3dba163fcaab2bf41fdaf4093947..4fb10e6877089b84018070dc4dcc5b98284a7f27 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -27,6 +27,7 @@ class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxBitmapHandler;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxCursor;

+class WXDLLEXPORT wxControl;

 
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.
 
 // A mask is a mono bitmap used for drawing bitmaps
 // transparently.


@@ -35,7 +36,7 @@ class WXDLLEXPORT wxMask: public wxObject
   DECLARE_DYNAMIC_CLASS(wxMask)
 
 public:
   DECLARE_DYNAMIC_CLASS(wxMask)
 
 public:

-  wxMask(void);
+  wxMask();

 
   // Construct a mask from a bitmap and a colour indicating
   // the transparent area
 
   // Construct a mask from a bitmap and a colour indicating
   // the transparent area


@@ -48,7 +49,7 @@ public:
   // Construct a mask from a mono bitmap (copies the bitmap).
   wxMask(const wxBitmap& bitmap);
 
   // Construct a mask from a mono bitmap (copies the bitmap).
   wxMask(const wxBitmap& bitmap);
 

-  ~wxMask(void);
+  ~wxMask();

 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);
   bool Create(const wxBitmap& bitmap, int paletteIndex);
 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);
   bool Create(const wxBitmap& bitmap, int paletteIndex);


@@ -67,8 +68,8 @@ class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxIcon;
     friend class WXDLLEXPORT wxCursor;
 public:
     friend class WXDLLEXPORT wxIcon;
     friend class WXDLLEXPORT wxCursor;
 public:

-    wxBitmapRefData(void);
-    ~wxBitmapRefData(void);
+    wxBitmapRefData();
+    ~wxBitmapRefData();

 
 public:
   int           m_width;
 
 public:
   int           m_width;


@@ -120,18 +121,16 @@ class WXDLLEXPORT wxBitmap: public wxGDIObject
   friend class WXDLLEXPORT wxBitmapHandler;
 
 public:
   friend class WXDLLEXPORT wxBitmapHandler;
 
 public:

-  wxBitmap(void); // Platform-specific
+  wxBitmap(); // Platform-specific

 
   // Copy constructors
 
   // Copy constructors

-  inline wxBitmap(const wxBitmap& bitmap)
-  { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
+  wxBitmap(const wxBitmap& bitmap);

 
   // Initialize with raw data
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
 
   // Initialize with raw data
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 

-  class WXDLLEXPORT wxItem;

   // Initialize with XPM data
   // Initialize with XPM data

-  wxBitmap(char **data, wxItem *anItem = NULL);
+  wxBitmap(char **data, wxControl *anItem = NULL);

 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);


@@ -141,7 +140,7 @@ public:
 
   // If depth is omitted, will create a bitmap compatible with the display
   wxBitmap(int width, int height, int depth = -1);
 
   // If depth is omitted, will create a bitmap compatible with the display
   wxBitmap(int width, int height, int depth = -1);

-  ~wxBitmap(void);
+  ~wxBitmap();

 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);
 
   virtual bool Create(int width, int height, int depth = -1);
   virtual bool Create(void *data, long type, int width, int height, int depth = 1);


@@ -162,13 +161,14 @@ public:
   inline wxPalette *GetColourMap(void) const { return GetPalette(); }
   void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
 #endif
   inline wxPalette *GetColourMap(void) const { return GetPalette(); }
   void SetColourMap(wxPalette *cmap) { SetPalette(*cmap); };
 #endif

-  inline wxPalette* GetPalette(void) const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : NULL); }
+  inline wxPalette* GetPalette(void) const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }

   void SetPalette(const wxPalette& palette);
 
   void SetPalette(const wxPalette& palette);
 

-  inline wxMask *GetMask(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : NULL); }
+  inline wxMask *GetMask(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }

   void SetMask(wxMask *mask) ;
 
   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
   void SetMask(wxMask *mask) ;
 
   inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }

+

   inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
   inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
 
   inline bool operator == (const wxBitmap& bitmap) { return m_refData == bitmap.m_refData; }
   inline bool operator != (const wxBitmap& bitmap) { return m_refData != bitmap.m_refData; }
 


@@ -181,8 +181,8 @@ public:
   static wxBitmapHandler *FindHandler(const wxString& extension, long bitmapType);
   static wxBitmapHandler *FindHandler(long bitmapType);
 
   static wxBitmapHandler *FindHandler(const wxString& extension, long bitmapType);
   static wxBitmapHandler *FindHandler(long bitmapType);
 

-  static void InitStandardHandlers(void);
-  static void CleanUpHandlers(void);
+  static void InitStandardHandlers();
+  static void CleanUpHandlers();

 protected:
   static wxList sm_handlers;
 
 protected:
   static wxList sm_handlers;
 


@@ -191,7 +191,7 @@ public:
   void SetHBITMAP(WXHBITMAP bmp);
   inline WXHBITMAP GetHBITMAP(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
   inline void SetSelectedInto(wxDC *dc) { if (M_BITMAPDATA) M_BITMAPDATA->m_selectedInto = dc; }
   void SetHBITMAP(WXHBITMAP bmp);
   inline WXHBITMAP GetHBITMAP(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hBitmap : 0); }
   inline void SetSelectedInto(wxDC *dc) { if (M_BITMAPDATA) M_BITMAPDATA->m_selectedInto = dc; }

-  inline wxDC *GetSelectedInto(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_selectedInto : NULL); }
+  inline wxDC *GetSelectedInto(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_selectedInto : (wxDC*) NULL); }

   bool FreeResource(bool force = FALSE);
 
   // Creates a bitmap that matches the device context's depth, from
   bool FreeResource(bool force = FALSE);
 
   // Creates a bitmap that matches the device context's depth, from


@@ -208,5 +208,6 @@ public:
   wxBitmap GetBitmapForDC(wxDC& dc) const;
 
 };
   wxBitmap GetBitmapForDC(wxDC& dc) const;
 
 };

+

 #endif
   // _WX_BITMAP_H_
 #endif
   // _WX_BITMAP_H_