configure test for round

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

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index ba5528bbfc8f0f69cc110ff12fcbcec5e9939557..7369005ed9cc532700e0a0a090f8090e70dd2fda 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,15 +10,14 @@
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 
 #ifndef __GTKCHOICEH__
 #define __GTKCHOICEH__
 

-#ifdef __GNUG__
-    #pragma interface "choice.h"
-#endif
+class WXDLLIMPEXP_BASE wxSortedArrayString;
+class WXDLLIMPEXP_BASE wxArrayString;

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

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

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


@@ -34,6 +33,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,52 +53,60 @@ 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
 
     // implement base class pure virtuals

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

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

-    void SetSelection( int n );
-
-    virtual int GetCount() const;
-    int FindString( const wxString &string ) const;
-    wxString GetString( int n ) const;
+    int GetCurrentSelection() const { return GetSelection(); }
+    virtual void SetSelection(int n);

 
 

-    // implementation
-    wxList m_clientList;    // contains the client data for the items
+    virtual unsigned int GetCount() const;
+    virtual int FindString(const wxString& s, bool bCase = false) const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString& string);

 
 

-    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, unsigned int pos);

 
 

-    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 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 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, 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)
     wxSortedArrayString *m_strings;
 
 
     // this array is only used for controls with wxCB_SORT style, so only
     // allocate it if it's needed (hence using pointer)
     wxSortedArrayString *m_strings;
 

+public:
+    // this circumvents a GTK+ 2.0 bug so that the selection is
+    // invalidated properly
+    int m_selection_hack;
+
+private:

     DECLARE_DYNAMIC_CLASS(wxChoice)
 };
 
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };