X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5dd070c25bd91c12380f9aeada27a2b7b64ed1d7..835165d576b66441987b78519e6ef1fe74ea795a:/include/wx/statbox.h?ds=inline diff --git a/include/wx/statbox.h b/include/wx/statbox.h index 41d29b05b9..cacae66198 100644 --- a/include/wx/statbox.h +++ b/include/wx/statbox.h @@ -1,22 +1,35 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/statbox.h +// Purpose: wxStaticBox base header +// Author: Julian Smart +// Modified by: +// Created: +// Copyright: (c) Julian Smart +// RCS-ID: $Id$ +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_STATBOX_H_BASE_ #define _WX_STATBOX_H_BASE_ +#include "wx/defs.h" + #if wxUSE_STATBOX #include "wx/control.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 wxControl { public: wxStaticBoxBase() { } - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } virtual bool HasTransparentBackground() { return true; } @@ -27,14 +40,17 @@ public: // borderOther is the margin on all other sides virtual void GetBordersForSizer(int *borderTop, int *borderOther) const { - static const int BORDER = 5; // FIXME: hardcoded value + const int BORDER = 5; // FIXME: hardcoded value *borderTop = GetLabel().empty() ? BORDER : GetCharHeight(); *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__) @@ -43,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__)