Added wxTolBar::etMargins

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

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 200f9705eece6031f638827dc078bd924e6a5cf3..aa9fa411f68b69dac64f60a5e80ca307dfaef81c 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -125,15 +125,14 @@ public:
   // Copy constructors
   inline wxBitmap(const wxBitmap& bitmap)
   { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }
   // Copy constructors
   inline wxBitmap(const wxBitmap& bitmap)
   { Ref(bitmap); if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this); }

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

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

-#if USE_XPM_IN_MSW
+#if wxUSE_XPM_IN_MSW

   class wxItem;
   // Initialize with XPM data
   class wxItem;
   // Initialize with XPM data

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

 #endif
 
   // Load a file or resource
 #endif
 
   // Load a file or resource