set/get validator for wxTextCtrl part of wxComboCtrl and not the combo itself (patch...

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

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index f4dbd9fab03932ae1c1bd69d2dbd700ee91c5c71..bc8f39cf7d1bb59c70c366b3e08d4817f9af0f03 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -1,28 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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(NO_GCC_PRAGMA)
-#pragma interface "choice.h"
-#endif
-

 #include "wx/clntdata.h"
 
 #ifndef wxWIDGET_ARRAY_DEFINED
     #define wxWIDGET_ARRAY_DEFINED
 
     #include "wx/dynarray.h"
 #include "wx/clntdata.h"
 
 #ifndef wxWIDGET_ARRAY_DEFINED
     #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


@@ -32,8 +28,8 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 
 public:
     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,


@@ -45,7 +41,7 @@ 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,
     wxChoice(wxWindow *parent, wxWindowID id,
         const wxPoint& pos,
         const wxSize& size,


@@ -75,30 +71,29 @@ public:
         const wxString& name = wxChoiceNameStr);
 
     // implementation of wxControlWithItems
         const wxString& name = wxChoiceNameStr);
 
     // implementation of wxControlWithItems

-    virtual int GetCount() const;
+    virtual unsigned int GetCount() const;

     virtual int DoAppend(const wxString& item);
     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 DoInsert(const wxString& item, unsigned int pos);
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

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

-    virtual void Delete(int n);
-    virtual int FindString(const wxString& s) const;
+    virtual void Delete(unsigned int n);

     virtual void Clear();
     virtual void Clear();

-    virtual void SetString(int n, const wxString& s);
-    virtual wxString GetString(int n) const;
+    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
     virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     // Implementation
     virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();


@@ -117,14 +112,14 @@ protected:
     // common part of all contructors
     void Init();
 
     // common part of all contructors
     void Init();
 

-    size_t        m_noStrings;
+    unsigned int  m_noStrings;

     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
     wxStringList  m_stringList;
     wxClientDataDictionary m_clientDataDict;
     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
     wxStringList  m_stringList;
     wxClientDataDictionary m_clientDataDict;

-     
+

     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);