use WX_DEFINE_ARRAY_PTR instead of WX_DEFINE_ARRAY to suppress warnings about operator->()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
#define wxWIDGET_ARRAY_DEFINED
|
||||
|
||||
#include "wx/dynarray.h"
|
||||
WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
|
||||
WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
|
||||
#endif
|
||||
|
||||
// Choice item
|
||||
|
@@ -9,8 +9,8 @@
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_RADIOBOX_H_
|
||||
#define _WX_RADIOBOX_H_
|
||||
#ifndef _WX_MOTIF_RADIOBOX_H_
|
||||
#define _WX_MOTIF_RADIOBOX_H_
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma interface "radiobox.h"
|
||||
@@ -20,15 +20,13 @@
|
||||
#define wxWIDGET_ARRAY_DEFINED
|
||||
|
||||
#include "wx/dynarray.h"
|
||||
WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
|
||||
#endif
|
||||
WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
|
||||
#endif // wxWIDGET_ARRAY_DEFINED
|
||||
|
||||
#include "wx/arrstr.h"
|
||||
|
||||
class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioBox)
|
||||
|
||||
public:
|
||||
wxRadioBox() { Init(); }
|
||||
|
||||
@@ -108,10 +106,11 @@ public:
|
||||
void SetSel(int i) { m_selectedButton = i; }
|
||||
virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
|
||||
|
||||
private:
|
||||
void Init();
|
||||
|
||||
protected:
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
|
||||
int m_majorDim;
|
||||
int m_noItems;
|
||||
int m_noRowsOrCols;
|
||||
@@ -121,10 +120,12 @@ protected:
|
||||
WXWidget m_labelWidget;
|
||||
wxArrayString m_radioButtonLabels;
|
||||
|
||||
virtual void DoSetSize(int x, int y,
|
||||
int width, int height,
|
||||
int sizeFlags = wxSIZE_AUTO);
|
||||
private:
|
||||
void Init();
|
||||
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxRadioBox)
|
||||
};
|
||||
|
||||
#endif
|
||||
// _WX_RADIOBOX_H_
|
||||
#endif // _WX_MOTIF_RADIOBOX_H_
|
||||
|
||||
|
Reference in New Issue
Block a user