Reworked Frame class

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index c5dc0aff890878275cbf429a7bf6e456a01481e6..fb294bbc600f83c42e3a18c3253bd36afddfcb57 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_


@@ -17,53 +17,73 @@
 #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
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 
 public:
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
 
 public:

-    wxStaticBitmap() { }
-    
-    wxStaticBitmap(wxWindow *parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBitmapNameStr)
+    wxStaticBitmap() { Init(); }
+
+    wxStaticBitmap(wxWindow *parent,
+                   wxWindowID id,
+                   const wxGDIImage& label,
+                   const wxPoint& pos = wxDefaultPosition,
+                   const wxSize& size = wxDefaultSize,
+                   long style = 0,
+                   const wxString& name = wxStaticBitmapNameStr)

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

-    
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBitmapNameStr);
-    
-    virtual void SetBitmap(const wxBitmap& bitmap);
-    
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
-    
-    wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
-    
+
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxGDIImage& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBitmapNameStr);
+
+    virtual ~wxStaticBitmap() { Free(); }
+
+    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
+        { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; }
+    const wxBitmap& GetBitmap() const
+        { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
+

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

-    
-    // Implementation
+
+    // IMPLEMENTATION
+#ifdef __WIN16__

     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
     virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);

+#endif // __WIN16__

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

-    wxBitmap m_messageBitmap;
-    
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize() const;
+
+    void Init() { m_isIcon = TRUE; m_image = NULL; }
+    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;
+    wxGDIImage *m_image;

 };
 
 #endif
 };
 
 #endif