changed format of wxFontMapper entries: facename_encoding instead of encoding as key

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 42cb47350a0722cc5a1f2589ea52134d856700e1..3715b09f7ce6705e0fc075286eda922bd62b37c5 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -17,8 +17,10 @@
 #endif
 
 #include "wx/control.h"
 #endif
 
 #include "wx/control.h"

+#include "wx/icon.h"
+#include "wx/bitmap.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBitmapNameStr;

 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 
 // a control showing an icon or a bitmap
 class WXDLLEXPORT wxStaticBitmap : public wxControl


@@ -30,7 +32,7 @@ public:
 
     wxStaticBitmap(wxWindow *parent,
                    wxWindowID id,
 
     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,


@@ -41,7 +43,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,


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

-    virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }
-    virtual void SetBitmap(const wxBitmap& bitmap);
+    void SetIcon(const wxIcon& icon) { SetImage(icon); }
+    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
 
     // 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; }
+        { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; }

     const wxBitmap& GetBitmap() const
     const wxBitmap& GetBitmap() const

-        { wxASSERT( !m_isIcon ); return *m_image.bitmap; }
+        { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }

 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
 
     // IMPLEMENTATION
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
 
     // IMPLEMENTATION

-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-

 #ifdef __WIN16__
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
 #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;
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    wxGDIImage *m_image;

 };
 
 #endif
 };
 
 #endif