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 06956d91b545af86f62d64440a6f89afe68b2f25..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:
 // Purpose:     wxStaticBox class
 // Author:      Julian Smart
 // Modified by:


@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

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


@@ -42,9 +42,11 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
 

-private:
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
 };
 

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