Move "static" keyword out from wxDEPRECATED() macros to placate icc.

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 42cb47350a0722cc5a1f2589ea52134d856700e1..71cffec52beb5e95f152ae61227d1da8f70782ac 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


@@ -12,36 +12,34 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 

-#ifdef __GNUG__
-    #pragma interface "statbmp.h"
-#endif
-

 #include "wx/control.h"
 #include "wx/control.h"

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

 
 

-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBitmapNameStr[];

 
 // a control showing an icon or a bitmap
 
 // a control showing an icon or a bitmap

-class WXDLLEXPORT wxStaticBitmap : public wxControl
+class WXDLLIMPEXP_CORE 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 wxString& name = wxStaticBitmapNameStr)
     {
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    long style = 0,
                    const wxString& name = wxStaticBitmapNameStr)
     {

+        Init();
+

         Create(parent, id, label, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
         Create(parent, id, label, pos, size, style, name);
     }
 
     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 +47,46 @@ public:
 
     virtual ~wxStaticBitmap() { Free(); }
 
 
     virtual ~wxStaticBitmap() { Free(); }
 

-    virtual void SetIcon(const wxIcon& icon) { SetBitmap(icon); }
-    virtual void SetBitmap(const wxBitmap& 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 *m_image.icon; }
-    const wxBitmap& GetBitmap() const
-        { wxASSERT( !m_isIcon ); return *m_image.bitmap; }
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual void SetIcon(const wxIcon& icon) { SetImage(&icon); }
+    virtual void SetBitmap(const wxBitmap& bitmap) { SetImage(&bitmap); }
+    virtual wxBitmap GetBitmap() const;
+    virtual wxIcon GetIcon() const;

 
 

-    // IMPLEMENTATION
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) { }
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

 
 

-#ifdef __WIN16__
-    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-#endif // __WIN16__
+    // returns true if the platform should explicitly apply a theme border
+    virtual bool CanApplyThemeBorder() const { return false; }

 
 protected:
 
 protected:

-    void Init() { m_isIcon = TRUE; m_image.icon = NULL; }
+    virtual wxSize DoGetBestSize() const;
+
+    // ctor/dtor helpers
+    void Init() { m_isIcon = true; m_image = NULL; m_currentHandle = 0; }

     void Free();
 
     void Free();
 

-    // TRUE if icon/bitmap is valid
+    // true if icon/bitmap is valid

     bool ImageIsOk() const;
 
     bool ImageIsOk() const;
 

+    void SetImage(const wxGDIImage* image);
+    void SetImageNoCopy( wxGDIImage* image );
+
+#ifndef __WXWINCE__
+    // draw the bitmap ourselves here if the OS can't do it correctly (if it
+    // can we leave it to it)
+    void DoPaintManually(wxPaintEvent& event);
+#endif // !__WXWINCE__
+
+

     // 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;
+
+    // handle used in last call to STM_SETIMAGE
+    WXHANDLE m_currentHandle;

 
 

-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    wxDECLARE_NO_COPY_CLASS(wxStaticBitmap);

 };
 
 #endif
 };
 
 #endif