Move wxGetOSFHandle to include/wx/msw/private.h since it needs HANDLE anyway

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 38a12b3a558d5cd098880030b7c86da207d193dc..ae0ed7219e932868acb0a78c8d629f801026ece7 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "statbmp.h"
 #endif
 
     #pragma interface "statbmp.h"
 #endif
 


@@ -20,7 +20,7 @@
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBitmapNameStr;

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


@@ -74,20 +74,18 @@ public:
     // -------------------------------
 
     // implement base class virtuals
     // -------------------------------
 
     // implement base class virtuals

-#ifdef __WIN16__
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-#endif // __WIN16__
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 protected:
 
 protected:

+    virtual wxBorder GetDefaultBorder() const;

     virtual wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // ctor/dtor helpers
     virtual wxSize DoGetBestSize() const;
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     // ctor/dtor helpers

-    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    void Init() { m_isIcon = true; m_image = NULL; }

     void Free();
 
     void Free();
 

-    // TRUE if icon/bitmap is valid
+    // true if icon/bitmap is valid

     bool ImageIsOk() const;
 
     void SetImage(const wxGDIImage* image);
     bool ImageIsOk() const;
 
     void SetImage(const wxGDIImage* image);