do platform-specific checks after ensuring that the symbols we use are defined; extra...

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index e8fc3a7f167e3bb787e1190d563f2f07d8aca6ac..5d8579b731587cee9054910279d4e17fbcbb5796 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -10,8 +10,8 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 

-class WXDLLIMPEXP_BASE wxSortedArrayString;
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;

 
 //-----------------------------------------------------------------------------
 // wxChoice
 
 //-----------------------------------------------------------------------------
 // wxChoice


@@ -45,7 +45,7 @@ public:
 
         Create(parent, id, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, choices, style, validator, name);
     }

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

     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,


@@ -62,17 +62,16 @@ public:
             const wxString& name = wxChoiceNameStr );
 
     // implement base class pure virtuals
             const wxString& name = wxChoiceNameStr );
 
     // implement base class pure virtuals

-    void Delete(int n);
+    void Delete(unsigned int n);

     void Clear();
 
     int GetSelection() const;
     void Clear();
 
     int GetSelection() const;

-    int GetCurrentSelection() const { return GetSelection(); }
-    void SetSelection( int n );
+    virtual void SetSelection(int n);

 
 

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

     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual int FindString(const wxString& s, bool bCase = false) const;

-    wxString GetString( int n ) const;
-    void SetString( int n, const wxString& string );
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& string);

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);


@@ -82,12 +81,12 @@ protected:
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual int DoAppend(const wxString& item);
 
     void DoApplyWidgetStyle(GtkRcStyle *style);
     virtual int DoAppend(const wxString& item);

-    virtual int DoInsert(const wxString& item, int pos);
+    virtual int DoInsert(const wxString& item, unsigned 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 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 wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 


@@ -95,7 +94,7 @@ protected:
 
 private:
     // common part of Create() and DoAppend()
 
 private:
     // common part of Create() and DoAppend()

-    int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
+    int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);

 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)