X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4004f41e3ce1655f9fa05c55a697ac0f8677c23a..2af18715e52d1900a3a0d0fd36ff80cab84932c1:/include/wx/msw/statbmp.h

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index fb294bbc60..e778d2e373 100644
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbmp.h
-// Purpose:     wxStaticBitmap class
+// Name:        wx/msw/statbmp.h
+// Purpose:     wxStaticBitmap class for wxMSW
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
@@ -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
 
@@ -23,10 +23,8 @@
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
-class WXDLLEXPORT wxStaticBitmap : public wxControl
+class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-
 public:
     wxStaticBitmap() { Init(); }
 
@@ -38,6 +36,8 @@ public:
                    long style = 0,
                    const wxString& name = wxStaticBitmapNameStr)
     {
+        Init();
+
         Create(parent, id, label, pos, size, style, name);
     }
 
@@ -51,28 +51,37 @@ public:
 
     virtual ~wxStaticBitmap() { Free(); }
 
-    void SetIcon(const wxIcon& icon) { SetImage(&icon); }
-    void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
+    virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
+    virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
 
     // assert failure is provoked by an attempt to get an icon from bitmap or
     // vice versa
-    const wxIcon& GetIcon() const
-        { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; }
-    const wxBitmap& GetBitmap() const
-        { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
+    wxIcon GetIcon() const
+    {
+        wxASSERT_MSG( m_isIcon, _T("no icon in this wxStaticBitmap") );
+
+        return *(wxIcon *)m_image;
+    }
 
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    wxBitmap GetBitmap() const
+    {
+        wxASSERT_MSG( !m_isIcon, _T("no bitmap in this wxStaticBitmap") );
+
+        return *(wxBitmap *)m_image;
+    }
 
-    // IMPLEMENTATION
-#ifdef __WIN16__
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-#endif // __WIN16__
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    // implementation only from now on
+    // -------------------------------
+
+    // 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;
 
+    // ctor/dtor helpers
     void Init() { m_isIcon = TRUE; m_image = NULL; }
     void Free();
 
@@ -80,10 +89,15 @@ protected:
     bool ImageIsOk() const;
 
     void SetImage(const wxGDIImage* image);
+    void SetImageNoCopy( wxGDIImage* image );
 
     // we can have either an icon or a bitmap
     bool m_isIcon;
     wxGDIImage *m_image;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_NO_COPY_CLASS(wxStaticBitmap)
 };
 
 #endif