X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/radiobox.h?ds=sidebyside diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index a91b8c5ebd..2306f13120 100644 --- a/include/wx/radiobox.h +++ b/include/wx/radiobox.h @@ -12,6 +12,8 @@ #ifndef _WX_RADIOBOX_H_BASE_ #define _WX_RADIOBOX_H_BASE_ +#include "wx/defs.h" + #if wxUSE_RADIOBOX #include "wx/ctrlsub.h" @@ -26,7 +28,7 @@ WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray); #endif // wxUSE_TOOLTIPS -extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioBoxNameStr[]; // ---------------------------------------------------------------------------- // wxRadioBoxBase is not a normal base class, but rather a mix-in because the @@ -34,7 +36,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxRadioBoxNameStr[]; // example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxRadioBoxBase : public wxItemContainerImmutable +class WXDLLIMPEXP_CORE wxRadioBoxBase : public wxItemContainerImmutable { public: virtual ~wxRadioBoxBase(); @@ -49,7 +51,8 @@ public: unsigned int GetColumnCount() const { return m_numCols; } unsigned int GetRowCount() const { return m_numRows; } - // return the item above/below/to the left/right of the given one + // return the next active (i.e. shown and not disabled) item above/below/to + // the left/right of the given one int GetNextItem(int item, wxDirection dir, long style) const; #if wxUSE_TOOLTIPS @@ -96,6 +99,8 @@ protected: #endif // wxUSE_TOOLTIPS } + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + // return the number of items in major direction (which depends on whether // we have wxRA_SPECIFY_COLS or wxRA_SPECIFY_ROWS style) unsigned int GetMajorDim() const { return m_majorDim; } @@ -158,13 +163,11 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/radiobox.h" #elif defined(__WXMAC__) - #include "wx/mac/radiobox.h" + #include "wx/osx/radiobox.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/radiobox.h" #elif defined(__WXPM__) #include "wx/os2/radiobox.h" -#elif defined(__WXPALMOS__) - #include "wx/palmos/radiobox.h" #endif #endif // wxUSE_RADIOBOX