Implemented PocketPC menubar/toolbar as wxToolMenuBar derived

[wxWidgets.git] / include / wx / motif / choice.h

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 1636502e63030e8fd4f2e69e08d6843cc07ba964..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"
     #define wxWIDGET_ARRAY_DEFINED
 
     #include "wx/dynarray.h"

-    WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
+    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);

 #endif
 
 // Choice item
 #endif
 
 // Choice item


@@ -46,6 +46,18 @@ public:
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     

+    wxChoice(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr)
+    {
+        Init();
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+

     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -54,6 +66,14 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxChoiceNameStr);
 
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxChoiceNameStr);
 

+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr);
+

     // implementation of wxControlWithItems
     virtual int GetCount() const;
     virtual int DoAppend(const wxString& item);
     // implementation of wxControlWithItems
     virtual int GetCount() const;
     virtual int DoAppend(const wxString& item);


@@ -80,7 +100,7 @@ public:
     void SetFocus();
     
     // Implementation
     void SetFocus();
     
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_formWidget; }
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_formWidget; }