unified wxTaskBarIcon behaviour: wxMSW version is not removed automatically when...

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index e1d5f2e85aafdb24e7a02e60070e450525f3865c..decf37139d5f4157cb536226e232af7cb8d69957 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -12,19 +12,13 @@
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "statbox.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
-
 // Group box
-class WXDLLEXPORT wxStaticBox : public wxControl
+class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase
 {
-DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
 public:
     wxStaticBox() { }
 
@@ -48,16 +42,16 @@ public:
     // implementation from now on
     // --------------------------
 
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 
 #endif