Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/os2/statbmp.h b/include/wx/os2/statbmp.h
index 01ad8f183a6353663c714ff2a18535fcdfdb9a0e..b8c10e29ddfe91934c1dcda068bc0a39ab40b93b 100644 (file)
--- a/include/wx/os2/statbmp.h
+++ b/include/wx/os2/statbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbmp.h
+// Name:        wx/os2/statbmp.h

 // Purpose:     wxStaticBitmap class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxStaticBitmap class
 // Author:      David Webster
 // Modified by:


@@ -12,18 +12,11 @@
 #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/icon.h"
 
 #include "wx/control.h"
 #include "wx/icon.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
-
-class WXDLLEXPORT wxStaticBitmap: public wxControl
+class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)

  public:
     inline wxStaticBitmap() { Init(); }
 
  public:
     inline wxStaticBitmap() { Init(); }
 


@@ -50,17 +43,22 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
     inline virtual ~wxStaticBitmap() { Free(); }
 
     virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }
     inline virtual ~wxStaticBitmap() { Free(); }
 
     virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }

-    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); };
+    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }

 
     // 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_bIsIcon ); return *(wxIcon *)m_pImage; }
       { wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }

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

       { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
 
       { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
 

-    // overriden base class virtuals
+    // overridden base class virtuals

     virtual bool AcceptsFocus() const { return FALSE; }
     virtual bool AcceptsFocus() const { return FALSE; }

+    virtual MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+    void OnPaint(wxPaintEvent& rEvent);

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;


@@ -76,7 +74,10 @@ protected:
     // we can have either an icon or a bitmap
     bool                            m_bIsIcon;
     wxGDIImage*                     m_pImage;
     // we can have either an icon or a bitmap
     bool                            m_bIsIcon;
     wxGDIImage*                     m_pImage;

-};
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_EVENT_TABLE()
+}; // end of wxStaticBitmap

 
 #endif
     // _WX_STATBMP_H_
 
 #endif
     // _WX_STATBMP_H_