Added some missing STL-like wxArray/wxArrayString constructors.

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 734392f53b0e3c722babe70ccc4ba8bf483445be..5bce253763438bdee06b7b1115c2f8c4befde008 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_
 
 #ifndef _WX_STATBOX_H_
 #define _WX_STATBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "statbox.h"
 #endif
 
     #pragma interface "statbox.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
-

 // Group box
 // Group box

-class WXDLLEXPORT wxStaticBox : public wxControl
+class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxStaticBox)
-

 public:
     wxStaticBox() { }
 
 public:
     wxStaticBox() { }
 


@@ -50,14 +44,14 @@ public:
 
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
 
     virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-

     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
     virtual wxSize DoGetBestSize() const;
     // overriden base class virtuals
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
     virtual wxSize DoGetBestSize() const;

+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)

 };
 
 #endif
 };
 
 #endif