Add missing wxUSE_OLE checks to safearray.cpp.

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 8d1a30846e42e44b32d11466d5a0c0d9cf651ecf..0f5ada2308496fe1d4328b51386c9328089a2f79 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -1,37 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.h
+// Name:        wx/motif/choice.h

 // Purpose:     wxChoice class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxChoice class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "choice.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
-

 #include "wx/clntdata.h"
 #include "wx/clntdata.h"

-#include "wx/dynarray.h"

 
 

-WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
+#ifndef wxWIDGET_ARRAY_DEFINED
+    #define wxWIDGET_ARRAY_DEFINED
+
+    #include "wx/dynarray.h"
+    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
+#endif

 
 // Choice item
 
 // Choice item

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

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

-    ~wxChoice();
-    
+    virtual ~wxChoice();
+

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


@@ -43,7 +41,19 @@ public:
         Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
         Init();
         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,


@@ -52,33 +62,34 @@ 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
     // 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 unsigned int GetCount() const;

     virtual int GetSelection() const;
     virtual int GetSelection() const;

-    virtual void Delete(int n);
-    virtual int FindString(const wxString& s) const;
-    virtual void Clear();
-    virtual void SetString(int n, const wxString& s);
-    virtual wxString GetString(int n) const;
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;

 
     // implementation of wxChoiceBase
     virtual void SetSelection(int n);
     virtual void SetColumns(int n = 1 );
     virtual int GetColumns() const ;
 
     // implementation of wxChoiceBase
     virtual void SetSelection(int n);
     virtual void SetColumns(int n = 1 );
     virtual int GetColumns() const ;

-    
-    // Original API    
+
+    // Original API

     virtual void Command(wxCommandEvent& event);
     virtual void Command(wxCommandEvent& event);

-    
+

     void SetFocus();
     void SetFocus();

-    
+

     // Implementation
     // 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; }


@@ -88,25 +99,27 @@ public:
 
     // implementation, for wxChoiceCallback
     const wxWidgetArray& GetWidgets() const { return m_widgetArray; }
 
     // implementation, for wxChoiceCallback
     const wxWidgetArray& GetWidgets() const { return m_widgetArray; }

-    const wxStringList&  GetStrings() const { return m_stringList; }
+    const wxArrayString&  GetStrings() const { return m_stringArray; }

 protected:
     // minimum size for the text ctrl
     wxSize GetItemsSize() const;
     // common part of all contructors
     void Init();
 
 protected:
     // 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;
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;

-    wxStringList  m_stringList;
-    wxClientDataDictionary m_clientDataDict;
-     
+    wxArrayString m_stringArray;
+

     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);

+
+    // implementation of wxControlWithItems
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);

 };
 
 };
 

-#endif
-// _WX_CHOICE_H_
+#endif // _WX_CHOICE_H_