put wxUSE_DATAVIEWCTRL in alphabetical order

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

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

-#ifdef __GNUG__
-    #pragma interface "statbmp.h"
-#endif
-

 #include "wx/control.h"
 #include "wx/icon.h"
 #include "wx/bitmap.h"
 
 #include "wx/control.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


@@ -53,41 +49,20 @@ public:
 
     virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
     virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
 
     virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
     virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }

+    virtual wxBitmap GetBitmap() const;
+    virtual wxIcon GetIcon() const;

 
 

-    // assert failure is provoked by an attempt to get an icon from bitmap or
-    // vice versa
-    wxIcon GetIcon() const
-    {
-        wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") );
-
-        return *(wxIcon *)m_image;
-    }
-
-    wxBitmap GetBitmap() const
-    {
-        wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
-
-        return *(wxBitmap *)m_image;
-    }
-
-    // implementation only from now on
-    // -------------------------------
-
-    // implement base class virtuals
-#ifdef __WIN16__
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-#endif // __WIN16__
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 protected:
 
 protected:

+    virtual wxBorder GetDefaultBorder() const;

     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
     // ctor/dtor helpers
 
     // ctor/dtor helpers

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

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


@@ -97,6 +72,9 @@ protected:
     bool m_isIcon;
     wxGDIImage *m_image;
 
     bool m_isIcon;
     wxGDIImage *m_image;
 

+    // handle used in last call to STM_SETIMAGE
+    WXHANDLE m_currentHandle;
+

 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
     DECLARE_NO_COPY_CLASS(wxStaticBitmap)