ProcessEvent() now saves the m_lastXXX parameters in case the event handler will

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index e7919e482e035e9cf1322806eb994d0d46e13dc7..cbe8b012fcffec68b23d8df185981870f6000314 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -43,7 +43,7 @@ public:
 
   // Construct a mask from a bitmap and a palette index indicating
   // the transparent area
 
   // Construct a mask from a bitmap and a palette index indicating
   // the transparent area

-  wxMask(const wxBitmap& bitmap, const int paletteIndex);
+  wxMask(const wxBitmap& bitmap, int paletteIndex);

 
   // 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);


@@ -51,7 +51,7 @@ public:
   ~wxMask(void);
 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);
   ~wxMask(void);
 
   bool Create(const wxBitmap& bitmap, const wxColour& colour);

-  bool Create(const wxBitmap& bitmap, const int paletteIndex);
+  bool Create(const wxBitmap& bitmap, int paletteIndex);

   bool Create(const wxBitmap& bitmap);
 
   // Implementation
   bool Create(const wxBitmap& bitmap);
 
   // Implementation


@@ -79,7 +79,7 @@ public:
   wxPalette     m_bitmapPalette;
   int           m_quality;
 
   wxPalette     m_bitmapPalette;
   int           m_quality;
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   WXHBITMAP     m_hBitmap;
   wxDC *        m_selectedInto; // So bitmap knows whether it's been selected into
                       // a device context (for error checking)
   WXHBITMAP     m_hBitmap;
   wxDC *        m_selectedInto; // So bitmap knows whether it's been selected into
                       // a device context (for error checking)


@@ -95,14 +95,14 @@ class WXDLLEXPORT wxBitmapHandler: public wxObject
 public:
   wxBitmapHandler(void) { m_name = ""; m_extension = ""; m_type = 0; };
 
 public:
   wxBitmapHandler(void) { m_name = ""; m_extension = ""; m_type = 0; };
 

-  virtual bool Create(wxBitmap *bitmap, void *data, const long flags, const int width, const int height, const int depth = 1);
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, const long flags,
+  virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,

       int desiredWidth, int desiredHeight);
       int desiredWidth, int desiredHeight);

-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, const int type, const wxPalette *palette = NULL);
+  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);

 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }
 
   inline void SetName(const wxString& name) { m_name = name; }
   inline void SetExtension(const wxString& ext) { m_extension = ext; }

-  inline void SetType(const long type) { m_type = type; }
+  inline void SetType(long type) { m_type = type; }

   inline wxString GetName(void) const { return m_name; }
   inline wxString GetExtension(void) const { return m_extension; }
   inline long GetType(void) const { return m_type; }
   inline wxString GetName(void) const { return m_name; }
   inline wxString GetExtension(void) const { return m_extension; }
   inline long GetType(void) const { return m_type; }


@@ -128,27 +128,28 @@ public:
   inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
 
   // Initialize with raw data
   inline wxBitmap(const wxBitmap* bitmap) { if (bitmap) Ref(*bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
 
   // Initialize with raw data

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

 
 #if USE_XPM_IN_MSW
 
 #if USE_XPM_IN_MSW

+  class wxItem;

   // Initialize with XPM data
   wxBitmap(const char **data, wxItem *anItem = NULL);
 #endif
 
   // Load a file or resource
   // Initialize with XPM data
   wxBitmap(const char **data, wxItem *anItem = NULL);
 #endif
 
   // Load a file or resource

-  wxBitmap(const wxString& name, const long type = wxBITMAP_TYPE_BMP_RESOURCE);
+  wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);

 
   // New constructor for generalised creation from data
 
   // New constructor for generalised creation from data

-  wxBitmap(void *data, const long type, const int width, const int height, const int depth = 1);
+  wxBitmap(void *data, long type, int width, int height, int depth = 1);

 
   // If depth is omitted, will create a bitmap compatible with the display
 
   // If depth is omitted, will create a bitmap compatible with the display

-  wxBitmap(const int width, const int height, const int depth = -1);
+  wxBitmap(int width, int height, int depth = -1);

   ~wxBitmap(void);
 
   ~wxBitmap(void);
 

-  virtual bool Create(const int width, const int height, const int depth = -1);
-  virtual bool Create(void *data, const long type, const int width, const int height, const int depth = 1);
-  virtual bool LoadFile(const wxString& name, const long type = wxBITMAP_TYPE_BMP_RESOURCE);
-  virtual bool SaveFile(const wxString& name, const int type, const wxPalette *cmap = NULL);
+  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 LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE);
+  virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);

 
   inline bool Ok(void) const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
   inline int GetWidth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
 
   inline bool Ok(void) const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
   inline int GetWidth(void) const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }