fix WinCE compilation: it doesn't know about SW_SHOWDEFAULT (#10216)

[wxWidgets.git] / interface / wx / ctrlsub.h

diff --git a/interface/wx/ctrlsub.h b/interface/wx/ctrlsub.h
index f5407614709e3d61963451f3ca475d5d58f694dc..f9d338c5d5efc14eb494dc31525bff6a30f2c92b 100644 (file)
--- a/interface/wx/ctrlsub.h
+++ b/interface/wx/ctrlsub.h
@@ -9,7 +9,6 @@
 
 /**
     @class wxItemContainerImmutable
 
 /**
     @class wxItemContainerImmutable

-    @wxheader{ctrlsub.h}

 
     wxItemContainer defines an interface which is implemented by all controls
     which have string subitems each of which may be selected.
 
     wxItemContainer defines an interface which is implemented by all controls
     which have string subitems each of which may be selected.


@@ -74,7 +73,7 @@ public:
         @param string
             The label to set.
     */
         @param string
             The label to set.
     */

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

 
     /**
         Finds an item whose label matches the given string.
 
     /**
         Finds an item whose label matches the given string.


@@ -87,7 +86,7 @@ public:
         @return The zero-based position of the item, or wxNOT_FOUND if the
                 string was not found.
     */
         @return The zero-based position of the item, or wxNOT_FOUND if the
                 string was not found.
     */

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

 
     //@}
 
 
     //@}
 


@@ -155,7 +154,6 @@ public:
 
 /**
     @class wxItemContainer
 
 /**
     @class wxItemContainer

-    @wxheader{ctrlsub.h}

 
     This class is an abstract base class for some wxWidgets controls which
     contain several items such as wxListBox, wxCheckListBox, wxComboBox or
 
     This class is an abstract base class for some wxWidgets controls which
     contain several items such as wxListBox, wxCheckListBox, wxComboBox or


@@ -648,7 +646,6 @@ public:
 
 /**
     @class wxControlWithItems
 
 /**
     @class wxControlWithItems

-    @wxheader{ctrlsub.h}

 
     This is convenience class that derives from both wxControl and
     wxItemContainer. It is used as basis for some wxWidgets controls
 
     This is convenience class that derives from both wxControl and
     wxItemContainer. It is used as basis for some wxWidgets controls