use WX_DEFINE_ARRAY_PTR instead of WX_DEFINE_ARRAY to suppress warnings about operato...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index f4dbd9fab03932ae1c1bd69d2dbd700ee91c5c71..7cd969839a80aced2ba00fccab4b73055bfb20d6 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -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

diff --git a/include/wx/motif/radiobox.h b/include/wx/motif/radiobox.h
index 91f84f15572d8fd73397fbeb596155c88e2728a1..6ba0e29882f7233a47157087b19f9c83e266453d 100644 (file)
--- a/include/wx/motif/radiobox.h
+++ b/include/wx/motif/radiobox.h
@@ -9,26 +9,24 @@
 // 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"
+    #pragma interface "radiobox.h"
 #endif
 
 #ifndef wxWIDGET_ARRAY_DEFINED
     #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_
+