Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use WX_DEFINE_ARRAY_PTR instead of WX_DEFINE_ARRAY to suppress warnings about operator->()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-16 10:14:42 +00:00
parent 6058220154
commit 4b4f6e0fdd
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/motif/choice.h
View File

@@ -22,7 +22,7 @@
#define wxWIDGET_ARRAY_DEFINED #define wxWIDGET_ARRAY_DEFINED
#include "wx/dynarray.h" #include "wx/dynarray.h"
WX_DEFINE_ARRAY(WXWidget, wxWidgetArray); WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
#endif #endif
// Choice item // Choice item

31
include/wx/motif/radiobox.h
View File

@@ -9,26 +9,24 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef _WX_RADIOBOX_H_ #ifndef _WX_MOTIF_RADIOBOX_H_
#define _WX_RADIOBOX_H_ #define _WX_MOTIF_RADIOBOX_H_
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "radiobox.h" #pragma interface "radiobox.h"
#endif #endif
#ifndef wxWIDGET_ARRAY_DEFINED #ifndef wxWIDGET_ARRAY_DEFINED
#define wxWIDGET_ARRAY_DEFINED #define wxWIDGET_ARRAY_DEFINED
#include "wx/dynarray.h" #include "wx/dynarray.h"
WX_DEFINE_ARRAY(WXWidget, wxWidgetArray); WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
#endif #endif // wxWIDGET_ARRAY_DEFINED
#include "wx/arrstr.h" #include "wx/arrstr.h"
class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase class WXDLLEXPORT wxRadioBox : public wxControl, public wxRadioBoxBase
{ {
DECLARE_DYNAMIC_CLASS(wxRadioBox)
public: public:
wxRadioBox() { Init(); } wxRadioBox() { Init(); }
@@ -108,10 +106,11 @@ public:
void SetSel(int i) { m_selectedButton = i; } void SetSel(int i) { m_selectedButton = i; }
virtual WXWidget GetLabelWidget() const { return m_labelWidget; } virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
private:
void Init();
protected: protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
int m_majorDim; int m_majorDim;
int m_noItems; int m_noItems;
int m_noRowsOrCols; int m_noRowsOrCols;
@@ -121,10 +120,12 @@ protected:
WXWidget m_labelWidget; WXWidget m_labelWidget;
wxArrayString m_radioButtonLabels; wxArrayString m_radioButtonLabels;
virtual void DoSetSize(int x, int y, private:
int width, int height, void Init();
int sizeFlags = wxSIZE_AUTO);
DECLARE_DYNAMIC_CLASS(wxRadioBox)
}; };
#endif #endif // _WX_MOTIF_RADIOBOX_H_
// _WX_RADIOBOX_H_