fixed bug in Set() on DST days (patch 1097811)

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 87393c2f47a16a17339d8065ba5aa0d7ef5b571f..ec93e0c97af52379fdafd488b71a2091c01798a3 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -6,67 +6,48 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
+#ifndef _WX_MSW_STATBOX_H_
+#define _WX_MSW_STATBOX_H_

 
 

-#ifdef __GNUG__
-#pragma interface "statbox.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "statbox.h"

 #endif
 
 #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() { }
 
     wxStaticBox(wxWindow *parent, wxWindowID id,
 public:
     wxStaticBox() { }
 
     wxStaticBox(wxWindow *parent, wxWindowID id,

-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBoxNameStr)
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr)

     {
         Create(parent, id, label, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     {
         Create(parent, id, label, pos, size, style, name);
     }
 
     bool Create(wxWindow *parent, wxWindowID id,

-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBoxNameStr);
-
-    // implementation from now on
-    // --------------------------
-
-    void OnEraseBackground(wxEraseEvent& event);
+                const wxString& label,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = 0,
+                const wxString& name = wxStaticBoxNameStr);

 
 

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual WXHBRUSH MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC);

 
 

-protected:
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual wxSize DoGetBestSize();

 
 

-private:
-    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)

 };
 
 };
 

-#endif
-    // _WX_STATBOX_H_
+#endif // _WX_MSW_STATBOX_H_
+