MVC works now.

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

diff --git a/include/wx/gtk/choice.h b/include/wx/gtk/choice.h
index 78ff53846c28415803b4e1325fce520d454b7541..28a5efdcc0087d333927905f03d620f94293a7a7 100644 (file)
--- a/include/wx/gtk/choice.h
+++ b/include/wx/gtk/choice.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -70,13 +70,15 @@ public:
     void SetSelection( int n );
 
     virtual int GetCount() const;
     void SetSelection( int n );
 
     virtual int GetCount() const;

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

     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     wxString GetString( int n ) const;
     void SetString( int n, const wxString& string );
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

+    virtual bool IsOwnGtkWindow( GdkWindow *window );
+

 protected:
     wxList m_clientList;    // contains the client data for the items
 
 protected:
     wxList m_clientList;    // contains the client data for the items
 


@@ -91,8 +93,6 @@ protected:
 
     virtual wxSize DoGetBestSize() const;
 
 
     virtual wxSize DoGetBestSize() const;
 

-    virtual bool IsOwnGtkWindow( GdkWindow *window );
-

 private:
     // common part of Create() and DoAppend()
     int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
 private:
     // common part of Create() and DoAppend()
     int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);


@@ -102,8 +102,8 @@ private:
     wxSortedArrayString *m_strings;
 
 public:
     wxSortedArrayString *m_strings;
 
 public:

-    // this circumvents a GTK+ 2.0 bug so that the selection is 
-    // invalidated properly 
+    // this circumvents a GTK+ 2.0 bug so that the selection is
+    // invalidated properly

     int m_selection_hack;
 
 private:
     int m_selection_hack;
 
 private: