/////////////////////////////////////////////////////////////////////////////
-// Name: statbox.h
+// Name: wx/statbox.h
// Purpose: wxStaticBox base header
-// Author: wxWidgets Team
+// Author: Julian Smart
// Modified by:
// Created:
-// Copyright: (c) wxWidgets Team
-// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if wxUSE_STATBOX
#include "wx/control.h"
+#include "wx/containr.h"
-extern WXDLLEXPORT_DATA(const wxChar*) wxStaticBoxNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxStaticBoxNameStr[];
// ----------------------------------------------------------------------------
// wxStaticBox: a grouping box with a label
// ----------------------------------------------------------------------------
-class WXDLLEXPORT wxStaticBoxBase : public wxControl
+class WXDLLIMPEXP_CORE wxStaticBoxBase : public wxNavigationEnabled<wxControl>
{
public:
- wxStaticBoxBase() { }
+ wxStaticBoxBase();
- // overriden base class virtuals
- virtual bool AcceptsFocus() const { return false; }
+ // overridden base class virtuals
virtual bool HasTransparentBackground() { return true; }
// implementation only: this is used by wxStaticBoxSizer to account for the
*borderOther = BORDER;
}
-private:
- DECLARE_NO_COPY_CLASS(wxStaticBoxBase)
+protected:
+ // choose the default border for this window
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
+ wxDECLARE_NO_COPY_CLASS(wxStaticBoxBase);
};
#if defined(__WXUNIVERSAL__)
#include "wx/msw/statbox.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/statbox.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
#include "wx/gtk/statbox.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/statbox.h"
#elif defined(__WXMAC__)
- #include "wx/mac/statbox.h"
+ #include "wx/osx/statbox.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/statbox.h"
#elif defined(__WXPM__)