changed removed wxToUpper to standard toupper

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index b6aca08bb1496af6f16878f73c2d1bd361991d0b..42cb47350a0722cc5a1f2589ea52134d856700e1 100644 (file)
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -6,61 +6,89 @@
 // 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_
 #define _WX_STATBMP_H_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 #ifdef __GNUG__

-#pragma interface "statbmp.h"
+    #pragma interface "statbmp.h"

 #endif
 
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
 #endif
 
 #include "wx/control.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
- public:
-  inline wxStaticBitmap(void) { }
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

 
 

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

 
 

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

 
 

-  virtual void SetBitmap(const wxBitmap& bitmap);
+    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 Command(wxCommandEvent& WXUNUSED(event)) {};
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
+    virtual ~wxStaticBitmap() { Free(); }

 
 

-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }
+    virtual void SetBitmap(const wxBitmap& bitmap);

 
 

-  inline wxBitmap& GetBitmap(void) const { return (wxBitmap&) m_messageBitmap; }
+    // 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; }
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return FALSE; }

 
 

-  // Implementation
-  virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
- protected:
-  wxBitmap m_messageBitmap;
+    // IMPLEMENTATION
+    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
+    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }

 
 

+#ifdef __WIN16__
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+#endif // __WIN16__
+
+protected:
+    void Init() { m_isIcon = TRUE; m_image.icon = NULL; }
+    void Free();
+
+    // TRUE if icon/bitmap is valid
+    bool ImageIsOk() const;
+
+    // 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);

 };
 
 #endif
 };
 
 #endif