Rename wxGetFileType to wxGetFileKind

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

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index b029e5833a2e494aa0e0c98b1a212c82ca7ac057..e0e4566370a49248554c847975c496014cb55fee 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -12,10 +12,12 @@
 #ifndef _WX_STATBMP_H_BASE_
 #define _WX_STATBMP_H_BASE_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbmpbase.h"
 #endif
 
+#include "wx/defs.h"
+
 #if wxUSE_STATBMP
 
 #include "wx/control.h"
@@ -24,26 +26,27 @@
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxBitmap;
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmapBase : public wxControl
 {
- public:
-#ifdef __DARWIN__
-    ~wxStaticBitmapBase() { }
-#endif
-    
+public:
+    wxStaticBitmapBase() { }
+    virtual ~wxStaticBitmapBase();
+
     // our interface
     virtual void SetIcon(const wxIcon& icon) = 0;
     virtual void SetBitmap(const wxBitmap& bitmap) = 0;
     virtual wxBitmap GetBitmap() const = 0;
 
     // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual bool AcceptsFocus() const { return false; }
 
 protected:
-    virtual wxSize DoGetBestClientSize() const;
+    virtual wxSize DoGetBestSize() const;
+
+    DECLARE_NO_COPY_CLASS(wxStaticBitmapBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -54,14 +57,12 @@ protected:
     #include "wx/motif/statbmp.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/statbmp.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/statbmp.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/statbmp.h"
+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)
     #include "wx/os2/statbmp.h"
-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/statbmp.h"
 #endif
 
 #endif // wxUSE_STATBMP