X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b03896f1af50d3619454d4488fbf41e8cb9c18c3..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/statbox.h?ds=inline diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 9d9976318d..e1ea580b4b 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbox.h +// Name: wx/statbox.h // Purpose: wxStaticBox base header -// Author: wxWidgets Team +// Author: Julian Smart // Modified by: // Created: -// Copyright: (c) wxWidgets Team +// Copyright: (c) Julian Smart // RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,20 +17,20 @@ #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 { public: - wxStaticBoxBase() { } + wxStaticBoxBase() { m_container.DisableSelfFocus(); } - // 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 @@ -46,8 +46,11 @@ public: *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__) @@ -56,10 +59,12 @@ private: #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__)