Fixed to work with the new wxMacControl system.

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index ba5528bbfc8f0f69cc110ff12fcbcec5e9939557..8732297d191c78eaee4d0431f9ac841f75806e73 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -10,10 +10,13 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 

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

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

+class WXDLLIMPEXP_BASE wxSortedArrayString;
+class WXDLLIMPEXP_BASE wxArrayString;
+

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


@@ -34,6 +37,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 )
+    {
+        m_strings = (wxSortedArrayString *)NULL;
+
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }

     ~wxChoice();
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
     ~wxChoice();
     bool Create( wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,


@@ -42,6 +57,13 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxChoiceNameStr );
             long style = 0,
             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 );

 
     // implement base class pure virtuals
     void Delete(int n);
 
     // implement base class pure virtuals
     void Delete(int n);


@@ -51,38 +73,32 @@ public:
     void SetSelection( int n );
 
     virtual int GetCount() const;
     void SetSelection( int n );
 
     virtual int GetCount() const;

-    int FindString( const wxString &string ) const;
+    int FindString( const wxString& string ) const;

     wxString GetString( int n ) const;
     wxString GetString( int n ) const;

+    void SetString( int n, const wxString& string );

 
 

-    // implementation
-    wxList m_clientList;    // contains the client data for the items
-
-    void DisableEvents();
-    void EnableEvents();
-    void AppendCommon( const wxString &item );
-    void ApplyWidgetStyle();
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 
 protected:
 
 protected:

+    wxList m_clientList;    // contains the client data for the items
+
+    void DoApplyWidgetStyle(GtkRcStyle *style);

     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 wxSize DoGetBestSize() const;

 
 

-    virtual void DoSetClientData( int n, void* clientData );
-    virtual void* DoGetClientData( int n ) const;
-    virtual void DoSetClientObject( int n, wxClientData* clientData );
-    virtual wxClientData* DoGetClientObject( int n ) const;
-
-    // the above virtuals hide these virtuals in wxChoiceBase
-    virtual void DoSetClientData(void* clientData )
-        { wxWindowBase::DoSetClientData(clientData); };
-    virtual void* DoGetClientData() const
-        { return(wxWindowBase::DoGetClientData()); };
-    virtual void DoSetClientObject( wxClientData* clientData )
-        { wxWindowBase::DoSetClientObject(clientData); };
-    virtual wxClientData* DoGetClientObject() const
-        { return(wxWindowBase::DoGetClientObject()); };
+    virtual bool IsOwnGtkWindow( GdkWindow *window );

 
 private:
     // common part of Create() and DoAppend()
 
 private:
     // common part of Create() and DoAppend()

-    size_t AppendHelper(GtkWidget *menu, const wxString& item);
+    int GtkAddHelper(GtkWidget *menu, 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)