update from Michalis Kabrianis (patch 1145218)

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

diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h
index 2e18c72266580dfcf3f65202ff5685e36fddc5d7..23735739d2dcc007db49ea533d67a9866cc2b5d1 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:
@@ -9,10 +9,10 @@
 // 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
 
@@ -39,20 +39,14 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticBoxNameStr);
 
-    // implementation from now on
-    // --------------------------
-
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    // overriden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-
 protected:
     virtual wxSize DoGetBestSize() const;
 
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 
-#endif
-    // _WX_STATBOX_H_
+#endif // _WX_MSW_STATBOX_H_
+