Some OS/2 updates

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index e412b276ad7a64c9a520523e70186a5f449cf40d..31dbb6c88f21efb7229bd6d731f1cbb5ccca515f 100644 (file)
--- 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
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97


@@ -18,20 +18,19 @@
 
 #include "wx/control.h"
 #include "wx/icon.h"
 
 #include "wx/control.h"
 #include "wx/icon.h"

+#include "wx/bitmap.h"

 
 WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;
 
 // a control showing an icon or a bitmap
 
 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(); }
 
     wxStaticBitmap(wxWindow *parent,
                    wxWindowID id,
 public:
     wxStaticBitmap() { Init(); }
 
     wxStaticBitmap(wxWindow *parent,
                    wxWindowID id,

-                   const wxBitmap& label,
+                   const wxGDIImage& label,

                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,


@@ -42,7 +41,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxBitmap& label,
+                const wxGDIImage& label,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -50,41 +49,39 @@ public:
 
     virtual ~wxStaticBitmap() { Free(); }
 
 
     virtual ~wxStaticBitmap() { Free(); }
 

-    virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }
-    virtual void SetBitmap(const wxBitmap& 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
 
     // assert failure is provoked by an attempt to get an icon from bitmap or
     // vice versa

-    const wxIcon& GetIcon() const
-        { wxASSERT( m_isIcon ); return *m_image.icon; }
-    const wxBitmap& GetBitmap() const
-        { wxASSERT( !m_isIcon ); return *m_image.bitmap; }
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    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);
 
     // IMPLEMENTATION
 #ifdef __WIN16__
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 #endif // __WIN16__
 #endif // __WIN16__

+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 protected:
 
 protected:

-    void Init() { m_isIcon = TRUE; m_image.icon = NULL; }
+    virtual wxSize DoGetBestSize() const;
+
+    void Init() { m_isIcon = TRUE; m_image = NULL; }

     void Free();
 
     // TRUE if icon/bitmap is valid
     bool ImageIsOk() const;
 
     void Free();
 
     // TRUE if icon/bitmap is valid
     bool ImageIsOk() const;
 

+    void SetImage(const wxGDIImage* image);
+

     // we can have either an icon or a bitmap
     bool m_isIcon;
     // we can have either an icon or a bitmap
     bool m_isIcon;

-    union
-    {
-        wxIcon *icon;
-        wxBitmap *bitmap;
-    } m_image;
+    wxGDIImage *m_image;

 
 

-    virtual wxSize DoGetBestSize();
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

 };
 
 #endif
 };
 
 #endif