Further wxAUI commits

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index ec79fcfe0041dccdfa388b9142d810ab536ff4a8..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


@@ -36,6 +32,8 @@ public:
                    long style = 0,
                    const wxString& name = wxStaticBitmapNameStr)
     {
                    long style = 0,
                    const wxString& name = wxStaticBitmapNameStr)
     {

+        Init();
+

         Create(parent, id, label, pos, size, style, name);
     }
 
         Create(parent, id, label, pos, size, style, name);
     }
 


@@ -51,27 +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( m_isIcon ); return *(wxIcon *)m_image; }
-    wxBitmap GetBitmap() const
-        { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
-
-    // IMPLEMENTATION
-#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;
 

-    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    // ctor/dtor helpers
+    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);


@@ -81,8 +72,12 @@ 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)
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

+    DECLARE_NO_COPY_CLASS(wxStaticBitmap)

 };
 
 #endif
 };
 
 #endif