moving common code

[wxWidgets.git] / include / wx / statbmp.h

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index bdd278fd075522d04fda0f1ea6e869ab4183d90d..b80459f3ff517192db273ba7c5238761fb69b9d6 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -20,7 +20,7 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 

-extern WXDLLEXPORT_DATA(const wxChar) wxStaticBitmapNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxStaticBitmapNameStr[];

 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl


@@ -45,6 +45,9 @@ public:
     virtual bool HasTransparentBackground() { return true; }
 
 protected:
     virtual bool HasTransparentBackground() { return true; }
 
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     virtual wxSize DoGetBestSize() const;
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
     virtual wxSize DoGetBestSize() const;
 
     DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)


@@ -56,8 +59,10 @@ protected:
     #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbmp.h"
     #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/statbmp.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/statbmp.h"
     #include "wx/gtk/statbmp.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/statbmp.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXCOCOA__)
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
 #elif defined(__WXCOCOA__)