Make wxString::WorstEncodingCase take a const wxMBConv&

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

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index cf7d4d36bc07a0d597886048cbc3c66e50a59a49..d5661e10fc5b62b1f1e7637e2b769c3d0a49ffec 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,13 +1,47 @@
-#ifndef __STATBOXH_BASE__
-#define __STATBOXH_BASE__
+#ifndef _WX_STATBOX_H_BASE_
+#define _WX_STATBOX_H_BASE_

 
 

-#if defined(__WINDOWS__)
+#if wxUSE_STATBOX
+
+#include "wx/control.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxStaticBoxNameStr;
+
+// ----------------------------------------------------------------------------
+// wxStaticBox: a grouping box with a label
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxStaticBoxBase : public wxControl
+{
+public:
+    wxStaticBoxBase() { }
+
+    // overriden base class virtuals
+    virtual bool AcceptsFocus() const { return false; }
+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+        { SetBackgroundColour(bg); }
+
+private:
+    DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+};
+
+#if defined(__WXUNIVERSAL__)
+#include "wx/univ/statbox.h"
+#elif defined(__WXMSW__)

 #include "wx/msw/statbox.h"
 #include "wx/msw/statbox.h"

-#elif defined(__MOTIF__)
-#include "wx/xt/statbox.h"
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#include "wx/motif/statbox.h"
+#elif defined(__WXGTK__)

 #include "wx/gtk/statbox.h"
 #include "wx/gtk/statbox.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/statbox.h"
+#elif defined(__WXCOCOA__)
+#include "wx/cocoa/statbox.h"
+#elif defined(__WXPM__)
+#include "wx/os2/statbox.h"

 #endif
 
 #endif
 

+#endif // wxUSE_STATBOX
+

 #endif
 #endif

-    // __STATBOXH_BASE__
+    // _WX_STATBOX_H_BASE_