don't process VK_OEM_XXX key presses

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

diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h
index 85308a7d1347ade8377bb7bce3727b90b6dc5e01..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


@@ -23,10 +23,8 @@
 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(); }
 
 public:
     wxStaticBitmap() { Init(); }
 


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

-    void SetIcon(const wxIcon& icon) { SetImage(icon); }
-    void SetBitmap(const wxBitmap& bitmap) { SetImage(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
+    wxIcon GetIcon() const

         { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; }
         { wxASSERT( m_isIcon ); return *(wxIcon *)m_image; }

-    const wxBitmap& GetBitmap() const
+    wxBitmap GetBitmap() const

         { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
 
         { wxASSERT( !m_isIcon ); return *(wxBitmap *)m_image; }
 

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

     // 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:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;


@@ -79,11 +74,14 @@ protected:
     // TRUE if icon/bitmap is valid
     bool ImageIsOk() const;
 
     // TRUE if icon/bitmap is valid
     bool ImageIsOk() const;
 

-    void SetImage(const wxGDIImage& image);
+    void SetImage(const wxGDIImage* image);

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

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

 };
 
 #endif
 };
 
 #endif