Use the correct WXDLLEXPORT declaration.

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 734392f53b0e3c722babe70ccc4ba8bf483445be..1f89b27e536bad61c0d09bb4fdb8045687ab84eb 100644 (file)
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.h
+// Name:        wx/msw/statbox.h

 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:


@@ -9,22 +9,16 @@
 // 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__
+#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() { }
 


@@ -45,20 +39,18 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 

-    // implementation from now on
-    // --------------------------
+    /// Implementation only
+    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;

 
 

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+protected:
+    virtual wxSize DoGetBestSize() const;

 
 

-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 

-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }

 
 

-protected:
-    virtual wxSize DoGetBestSize() const;
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)

 };
 
 };
 

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