projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use shared pointers to hold wxWebHandlers throughout.
[wxWidgets.git]
/
include
/
wx
/
radiobox.h
diff --git
a/include/wx/radiobox.h
b/include/wx/radiobox.h
index 070cc9f95b70282fa035d88b01c8be998c7a8444..6807523119fd59ab4541a7fdb3152386c87ab733 100644
(file)
--- a/
include/wx/radiobox.h
+++ b/
include/wx/radiobox.h
@@
-12,6
+12,8
@@
#ifndef _WX_RADIOBOX_H_BASE_
#define _WX_RADIOBOX_H_BASE_
#ifndef _WX_RADIOBOX_H_BASE_
#define _WX_RADIOBOX_H_BASE_
+#include "wx/defs.h"
+
#if wxUSE_RADIOBOX
#include "wx/ctrlsub.h"
#if wxUSE_RADIOBOX
#include "wx/ctrlsub.h"
@@
-20,13
+22,13
@@
#include "wx/dynarray.h"
#include "wx/dynarray.h"
-class WXDLL
EXPORT
wxToolTip;
+class WXDLL
IMPEXP_FWD_CORE
wxToolTip;
WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
#endif // wxUSE_TOOLTIPS
WX_DEFINE_EXPORTED_ARRAY_PTR(wxToolTip *, wxToolTipArray);
#endif // wxUSE_TOOLTIPS
-extern WXDLL
EXPORT_DATA(const wxC
har) wxRadioBoxNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxRadioBoxNameStr[];
// ----------------------------------------------------------------------------
// wxRadioBoxBase is not a normal base class, but rather a mix-in because the
// ----------------------------------------------------------------------------
// 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
// ----------------------------------------------------------------------------
// example, it is a wxStaticBox in wxUniv and wxMSW but not in other ports
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxRadioBoxBase : public wxItemContainerImmutable
+class WXDLL
IMPEXP_CORE
wxRadioBoxBase : public wxItemContainerImmutable
{
public:
virtual ~wxRadioBoxBase();
{
public:
virtual ~wxRadioBoxBase();
@@
-49,7
+51,8
@@
public:
unsigned int GetColumnCount() const { return m_numCols; }
unsigned int GetRowCount() const { return m_numRows; }
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
int GetNextItem(int item, wxDirection dir, long style) const;
#if wxUSE_TOOLTIPS
@@
-84,14
+87,6
@@
public:
}
}
- // deprecated functions
- // --------------------
-
-#if WXWIN_COMPATIBILITY_2_4
- wxDEPRECATED( int GetNumberOfRowsOrCols() const );
- wxDEPRECATED( void SetNumberOfRowsOrCols(int n) );
-#endif // WXWIN_COMPATIBILITY_2_4
-
protected:
wxRadioBoxBase()
{
protected:
wxRadioBoxBase()
{
@@
-104,6
+99,8
@@
protected:
#endif // wxUSE_TOOLTIPS
}
#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; }
// 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; }
@@
-166,7
+163,7
@@
private:
#elif defined(__WXGTK__)
#include "wx/gtk1/radiobox.h"
#elif defined(__WXMAC__)
#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__)
#elif defined(__WXCOCOA__)
#include "wx/cocoa/radiobox.h"
#elif defined(__WXPM__)