Add wxComboBox-compatible Popup() and Dismiss() functions in wxComboCtrl

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

diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index bc7d4e58fc1350d543902580a2e10b7b876fc46d..0ea76ac9ce517848e85825f0a14b3d4f3d4df5b4 100644 (file)
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -12,16 +12,10 @@
 #ifndef _WX_STATBMP_H_
 #define _WX_STATBMP_H_
 
-#ifdef __GNUG__
-#pragma interface "statbmp.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/icon.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
-class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
 {
  public:
     inline wxStaticBitmap() { Init(); }
@@ -53,7 +47,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
 
     // 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_bIsIcon ); return *(wxIcon *)m_pImage; }
     wxBitmap GetBitmap() const
       { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
@@ -64,6 +58,7 @@ class WXDLLEXPORT wxStaticBitmap : public wxStaticBitmapBase
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
+    void OnPaint(wxPaintEvent& rEvent);
 
 protected:
     virtual wxSize DoGetBestSize() const;
@@ -81,6 +76,7 @@ protected:
     wxGDIImage*                     m_pImage;
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_EVENT_TABLE()
 }; // end of wxStaticBitmap
 
 #endif