Fixed bug #1163384. Moved the code that handles activating the cell

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 31dbb6c88f21efb7229bd6d731f1cbb5ccca515f..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_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbmp.h"
 #endif
 
@@ -20,7 +20,7 @@
 #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
@@ -36,6 +36,8 @@ public:
                    long style = 0,
                    const wxString& name = wxStaticBitmapNameStr)
     {
+        Init();
+
         Create(parent, id, label, pos, size, style, name);
     }
 
@@ -55,26 +57,39 @@ public:
     // 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; }
+    {
+        wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") );
+
+        return *(wxIcon *)m_image;
+    }
+
     wxBitmap GetBitmap() const
-        { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
+    {
+        wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
+
+        return *(wxBitmap *)m_image;
+    }
+
+    // implementation only from now on
+    // -------------------------------
 
-    // IMPLEMENTATION
-#ifdef __WIN16__
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-#endif // __WIN16__
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // implement base class virtuals
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 protected:
+    virtual wxBorder GetDefaultBorder() const;
     virtual wxSize DoGetBestSize() const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
-    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    // ctor/dtor helpers
+    void Init() { m_isIcon = true; m_image = NULL; }
     void Free();
 
-    // TRUE if icon/bitmap is valid
+    // true if icon/bitmap is valid
     bool ImageIsOk() const;
 
     void SetImage(const wxGDIImage* image);
+    void SetImageNoCopy( wxGDIImage* image );
 
     // we can have either an icon or a bitmap
     bool m_isIcon;
@@ -82,6 +97,7 @@ protected:
 
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 };
 
 #endif