bitwise vs. logical operator

[wxWidgets.git] / wxPython / src / combo.i

diff --git a/wxPython/src/combo.i b/wxPython/src/combo.i
index dc7613714265bf60080a331c4efa49c46ca1e06f..d14a2487cebe8602f6222a6e15ea0659d9f673d6 100644 (file)
--- a/wxPython/src/combo.i
+++ b/wxPython/src/combo.i
@@ -11,7 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 %define DOCSTRING
-"ComboCtrl class that can have any type ofconst wxBitmap& bitmap,  popup widget, and also an
+"ComboCtrl class that can have any type of popup widget, and also an
 owner-drawn combobox control."
 %enddef
 
@@ -190,6 +190,7 @@ be used either as a mixin class combined with some standard or custom
 widget, or you can use the derived ComboPopup to create and hold an
 independent reference to the widget to be used for the popup.
 ", "
+
 Window Styles
 -------------
     ====================   ============================================
@@ -290,12 +291,17 @@ created, unless `OnButtonClick` has been overridden.", "");
         "Get the dropdown button which is part of the combobox.  Note: it's not
 necessarily a wx.Button or wx.BitmapButton.", "");
 
-
+    
+// NOTE: These are virtuals defined in a base class, so there
+// shouldn't be any reason to provide SWIG wrappers for them...    
 //     // forward these methods to all subcontrols
 //     virtual bool Enable(bool enable = true);
 //     virtual bool Show(bool show = true);
 //     virtual bool SetFont(const wxFont& font);
+//     virtual void SetValidator(const wxValidator &validator);
+//     virtual wxValidator *GetValidator();
 
+    
     // wxTextCtrl methods - for readonly combo they should return
     // without errors.
 
@@ -448,16 +454,6 @@ the argument.", "");
         "Returns true if given key combination should toggle the popup.", "");
 
 
-    // Prepare background of combo control or an item in a dropdown list
-    // in a way typical on platform. This includes painting the focus/disabled
-    // background and setting the clipping region.
-    // Unless you plan to paint your own focus indicator, you should always call this
-    // in your wxComboPopup::PaintComboControl implementation.
-    // In addition, it sets pen and text colour to what looks good and proper
-    // against the background.
-    // flags: wxRendererNative flags: wxCONTROL_ISSUBMENU: is drawing a list item instead of combo control
-    //                                wxCONTROL_SELECTED: list item is selected
-    //                                wxCONTROL_DISABLED: control/item is disabled
     DocDeclStr(
         virtual void , PrepareBackground( wxDC& dc, const wxRect& rect, int flags ) const,
         "Prepare background of combo control or an item in a dropdown list in a
@@ -1032,6 +1028,7 @@ DocStr(wxBitmapComboBox,
 currently only allows using bitmaps of one size, and resizes itself so
 that a bitmap can be shown next to the text field.",
 "
+
 Window Styles
 -------------
     ===================    ============================================
@@ -1100,7 +1097,7 @@ if not None.  The return value is the index of the newly added item.", "");
     
     
     DocDeclStr(
-        virtual wxBitmap , GetItemBitmap(unsigned int n) const,
+        virtual wxBitmap , GetItemBitmap(/*unsigned*/ int n) const,
         "Returns the image of the item with the given index.", "");
 
     
@@ -1109,7 +1106,7 @@ if not None.  The return value is the index of the newly added item.", "");
                "Insert an item into the control before the item at the ``pos`` index,
 optionally associating some data object with the item.", "");
         int Insert(const wxString& item, const wxBitmap& bitmap,
-                   unsigned int pos, PyObject* clientData=NULL) {
+                   /*unsigned*/ int pos, PyObject* clientData=NULL) {
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
                 return self->Insert(item, bitmap, pos, data);
@@ -1120,7 +1117,7 @@ optionally associating some data object with the item.", "");
 
     
     DocDeclStr(
-        virtual void , SetItemBitmap(unsigned int n, const wxBitmap& bitmap),
+        virtual void , SetItemBitmap(/*unsigned*/ int n, const wxBitmap& bitmap),
         "Sets the image for the given item.", "");