don't place NULL pointers in the GDK window array in GTKGetWindow()

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

diff --git a/interface/wx/ctrlsub.h b/interface/wx/ctrlsub.h
index fba3f49a1b00548fe81a19e0257a73e3acefc2cd..7ebe8a8334d7569f42f2a896c0959cd98ce092d3 100644 (file)
--- a/interface/wx/ctrlsub.h
+++ b/interface/wx/ctrlsub.h
@@ -40,7 +40,7 @@ public:
 
         @see IsEmpty()
     */
 
         @see IsEmpty()
     */

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

 
     /**
         Returns @true if the control is empty or @false if it has some items.
 
     /**
         Returns @true if the control is empty or @false if it has some items.


@@ -58,7 +58,7 @@ public:
         @return The label of the item or an empty string if the position was
                 invalid.
     */
         @return The label of the item or an empty string if the position was
                 invalid.
     */

-    virtual wxString GetString(unsigned int n) const;
+    virtual wxString GetString(unsigned int n) const = 0;

 
     /**
         Returns the array of the labels of all items in the control.
 
     /**
         Returns the array of the labels of all items in the control.


@@ -73,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) = 0;

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


@@ -86,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;

 
     //@}
 
 
     //@}
 


@@ -106,7 +106,7 @@ public:
 
         @see SetString(), SetStringSelection()
     */
 
         @see SetString(), SetStringSelection()
     */

-    virtual void SetSelection(int n);
+    virtual void SetSelection(int n) = 0;

 
     /**
         Returns the index of the selected item or @c wxNOT_FOUND if no item is
 
     /**
         Returns the index of the selected item or @c wxNOT_FOUND if no item is


@@ -120,7 +120,7 @@ public:
 
         @see SetSelection(), GetStringSelection()
     */
 
         @see SetSelection(), GetStringSelection()
     */

-    virtual int GetSelection() const;
+    virtual int GetSelection() const = 0;

 
     /**
         Selects the item with the specified string in the control. This doesn't
 
     /**
         Selects the item with the specified string in the control. This doesn't


@@ -247,7 +247,7 @@ public:
         @param items
             Array of strings to insert.
     */
         @param items
             Array of strings to insert.
     */

-    void Append(const wxArrayString& items);
+    int Append(const wxArrayString& items);

 
     /**
         Appends several items at once into the control.
 
     /**
         Appends several items at once into the control.


@@ -261,7 +261,7 @@ public:
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */

-    void Append(const wxArrayString& items, void **clientData);
+    int Append(const wxArrayString& items, void **clientData);

 
     /**
         Appends several items at once into the control.
 
     /**
         Appends several items at once into the control.


@@ -275,7 +275,7 @@ public:
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */

-    void Append(const wxArrayString& items, wxClientData **clientData);
+    int Append(const wxArrayString& items, wxClientData **clientData);

 
     /**
         Appends several items at once into the control.
 
     /**
         Appends several items at once into the control.


@@ -288,7 +288,7 @@ public:
         @param items
             Array of strings of size @a n.
     */
         @param items
             Array of strings of size @a n.
     */

-    void Append(unsigned int n, const wxString* items);
+    int Append(unsigned int n, const wxString* items);

 
     /**
         Appends several items at once into the control.
 
     /**
         Appends several items at once into the control.


@@ -304,8 +304,8 @@ public:
             Array of client data pointers of size @a n to associate with the
             new items.
     */
             Array of client data pointers of size @a n to associate with the
             new items.
     */

-    void Append(unsigned int n, const wxString* items,
-                void** clientData);
+    int Append(unsigned int n, const wxString* items,
+               void** clientData);

 
     /**
         Appends several items at once into the control.
 
     /**
         Appends several items at once into the control.


@@ -321,7 +321,7 @@ public:
             Array of client data pointers of size @a n to associate with the
             new items.
     */
             Array of client data pointers of size @a n to associate with the
             new items.
     */

-    void Append(unsigned int n, const wxString* items,
+    int Append(unsigned int n, const wxString* items,

                 wxClientData** clientData);
     //@}
 
                 wxClientData** clientData);
     //@}
 


@@ -463,7 +463,7 @@ public:
         @param pos
             Position to insert the items before, zero based.
     */
         @param pos
             Position to insert the items before, zero based.
     */

-    void Insert(const wxArrayString& items, unsigned int pos);
+    int Insert(const wxArrayString& items, unsigned int pos);

 
     /**
         Inserts several items at once into the control.
 
     /**
         Inserts several items at once into the control.


@@ -479,7 +479,7 @@ public:
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */

-    void Insert(const wxArrayString& items, unsigned int pos,
+    int Insert(const wxArrayString& items, unsigned int pos,

                 void **clientData);
 
     /**
                 void **clientData);
 
     /**


@@ -496,7 +496,7 @@ public:
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */
             Array of client data pointers of the same size as @a items to
             associate with the new items.
     */

-    void Insert(const wxArrayString& items, unsigned int pos,
+    int Insert(const wxArrayString& items, unsigned int pos,

                 wxClientData **clientData);
 
     /**
                 wxClientData **clientData);
 
     /**


@@ -512,7 +512,7 @@ public:
         @param pos
             Position to insert the items before, zero based.
     */
         @param pos
             Position to insert the items before, zero based.
     */

-    void Insert(unsigned int n, const wxString* items,
+    int Insert(unsigned int n, const wxString* items,

                 unsigned int pos);
 
     /**
                 unsigned int pos);
 
     /**


@@ -531,7 +531,7 @@ public:
             Array of client data pointers of size @a n to associate with the
             new items.
     */
             Array of client data pointers of size @a n to associate with the
             new items.
     */

-    void Insert(unsigned int n, const wxString* items,
+    int Insert(unsigned int n, const wxString* items,

                 unsigned int pos,
                 void** clientData);
 
                 unsigned int pos,
                 void** clientData);
 


@@ -551,7 +551,7 @@ public:
             Array of client data pointers of size @a n to associate with the
             new items.
     */
             Array of client data pointers of size @a n to associate with the
             new items.
     */

-    void Insert(unsigned int n, const wxString* items,
+    int Insert(unsigned int n, const wxString* items,

                 unsigned int pos,
                 wxClientData** clientData);
     //@}
                 unsigned int pos,
                 wxClientData** clientData);
     //@}