GetIcon() returns wxIconLocation, not wxIcon, now

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 18f80ca5bd563376c0638806b91f3cd4d14c7da0..e2ce50b03cc152c2d851fa44c9bea971ac650248 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -12,61 +12,69 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "choice.h"
 #endif
 
 #pragma interface "choice.h"
 #endif
 

-#include "wx/control.h"
+#include "wx/clntdata.h"
+#include "wx/dynarray.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);

 
 // Choice item
 
 // Choice item

-class WXDLLEXPORT wxChoice: public wxControl
+class WXDLLEXPORT wxChoice: public wxChoiceBase

 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     wxChoice();
     ~wxChoice();
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     wxChoice();
     ~wxChoice();

-
+    

     wxChoice(wxWindow *parent, wxWindowID id,
     wxChoice(wxWindow *parent, wxWindowID id,

-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr)
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr)

     {
     {

+        Init();

         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }

-
+    

     bool Create(wxWindow *parent, wxWindowID id,
     bool Create(wxWindow *parent, wxWindowID id,

-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr);
-
-    virtual void Append(const wxString& item);
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr);
+
+    // implementation of wxControlWithItems
+    virtual int GetCount() const;
+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
+    virtual void DoSetItemClientData(int n, void* clientData);
+    virtual void* DoGetItemClientData(int n) const;
+    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual int GetSelection() const;

     virtual void Delete(int n);
     virtual void Delete(int n);

-    virtual void Clear();
-    virtual int GetSelection() const ;
-    virtual void SetSelection(int n);

     virtual int FindString(const wxString& s) const;
     virtual int FindString(const wxString& s) const;

-    virtual wxString GetString(int n) const ;
-
-    virtual wxString GetStringSelection() const ;
-    virtual bool SetStringSelection(const wxString& sel);
-
-    virtual int Number() const { return m_noStrings; }
-    virtual void Command(wxCommandEvent& event);
+    virtual void Clear();
+    virtual void SetString(int n, const wxString& s);
+    virtual wxString GetString(int n) const;

 
 

+    // implementation of wxChoiceBase
+    virtual void SetSelection(int n);

     virtual void SetColumns(int n = 1 );
     virtual int GetColumns() const ;
     virtual void SetColumns(int n = 1 );
     virtual int GetColumns() const ;

-
+    
+    // Original API    
+    virtual void Command(wxCommandEvent& event);
+    

     void SetFocus();
     void SetFocus();

-
+    

     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();


@@ -74,18 +82,29 @@ public:
     WXWidget GetTopWidget() const { return m_formWidget; }
     WXWidget GetMainWidget() const { return m_buttonWidget; }
 
     WXWidget GetTopWidget() const { return m_formWidget; }
     WXWidget GetMainWidget() const { return m_buttonWidget; }
 

+    virtual wxSize DoGetBestSize() const;
+
+    // implementation, for wxChoiceCallback
+    const wxWidgetArray& GetWidgets() const { return m_widgetArray; }
+    const wxStringList&  GetStrings() const { return m_stringList; }

 protected:
 protected:

-    int           m_noStrings;
+    // minimum size for the text ctrl
+    wxSize GetItemsSize() const;
+    // common part of all contructors
+    void Init();
+
+    size_t        m_noStrings;

     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;
     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;

-    WXWidget*     m_widgetList ;
+    wxWidgetArray m_widgetArray;

     WXWidget      m_formWidget;
     wxStringList  m_stringList;
     WXWidget      m_formWidget;
     wxStringList  m_stringList;

-
+    wxClientDataDictionary m_clientDataDict;
+     

     virtual void DoSetSize(int x, int y,
     virtual void DoSetSize(int x, int y,

-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);

 };
 
 #endif
 };
 
 #endif

-       // _WX_CHOICE_H_
+// _WX_CHOICE_H_