typo fixed

[wxWidgets.git] / wxPython / contrib / gizmos / gizmos.i

diff --git a/wxPython/contrib/gizmos/gizmos.i b/wxPython/contrib/gizmos/gizmos.i
index 3c09032d649ec190e2bae21d1f216b2e4faad492..5c2426d295e93f74403653d69c5508c07d44b632 100644 (file)
--- a/wxPython/contrib/gizmos/gizmos.i
+++ b/wxPython/contrib/gizmos/gizmos.i
@@ -29,11 +29,6 @@
 #include "treelistctrl.h"
 #include "wx/wxPython/pytree.h"
 
 #include "treelistctrl.h"
 #include "wx/wxPython/pytree.h"
 

-    
-    static const wxString wxPyDynamicSashNameStr(wxT("dynamicSashWindow"));
-    static const wxString wxPyEditableListBoxNameStr(wxT("editableListBox"));
-    static const wxString wxPyTreeListCtrlNameStr(wxT("treelistctrl"));
-    static const wxString wxPyEmptyString(wxT(""));

 %}
 
 //---------------------------------------------------------------------------
 %}
 
 //---------------------------------------------------------------------------


@@ -42,6 +37,14 @@
 %import controls.i
 %pythoncode { wx = core }
 
 %import controls.i
 %pythoncode { wx = core }
 

+
+MAKE_CONST_WXSTRING2(DynamicSashNameStr, "dynamicSashWindow");
+MAKE_CONST_WXSTRING2(EditableListBoxNameStr, "editableListBox");
+MAKE_CONST_WXSTRING2(TreeListCtrlNameStr, "treelistctrl");
+
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+
+

 %include _gizmos_rename.i
 
 //---------------------------------------------------------------------------
 %include _gizmos_rename.i
 
 //---------------------------------------------------------------------------


@@ -272,8 +275,8 @@ public:
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
             PyObject* dcobj = wxPyMake_wxObject(&dc);
         wxPyBeginBlockThreads();
         if ((found = wxPyCBH_findCallback(m_myInst, "DrawItem"))) {
             PyObject* dcobj = wxPyMake_wxObject(&dc);

-            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), FALSE);
-            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), FALSE);
+            PyObject* idobj = wxPyConstructObject((void*)&id, wxT("wxTreeItemId"), False);
+            PyObject* recobj= wxPyConstructObject((void*)&rect, wxT("wxRect"), False);

             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
             Py_DECREF(dcobj);
             Py_DECREF(idobj);
             wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", dcobj, idobj, recobj));
             Py_DECREF(dcobj);
             Py_DECREF(idobj);


@@ -661,10 +664,10 @@ public:
     // allow the user to expand the items which don't have any children now
     // - but instead add them only when needed, thus minimizing memory
     // usage and loading time.
     // allow the user to expand the items which don't have any children now
     // - but instead add them only when needed, thus minimizing memory
     // usage and loading time.

-    void SetItemHasChildren(const wxTreeItemId& item, bool has = TRUE);
+    void SetItemHasChildren(const wxTreeItemId& item, bool has = True);

 
     // the item will be shown in bold
 
     // the item will be shown in bold

-    void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
+    void SetItemBold(const wxTreeItemId& item, bool bold = True);

 
     // set the item's text colour
     void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);
 
     // set the item's text colour
     void SetItemTextColour(const wxTreeItemId& item, const wxColour& col);


@@ -697,12 +700,12 @@ public:
     // is item text in bold font?
     bool IsBold(const wxTreeItemId& item) const;
 
     // is item text in bold font?
     bool IsBold(const wxTreeItemId& item) const;
 

-    // if 'recursively' is FALSE, only immediate children count, otherwise
+    // if 'recursively' is False, only immediate children count, otherwise

     // the returned number is the number of all items in this branch
     // the returned number is the number of all items in this branch

-    size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = TRUE);
+    size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = True);

 
 
 
 

-    // wxTreeItemId.IsOk() will return FALSE if there is no such item
+    // wxTreeItemId.IsOk() will return False if there is no such item

 
     // get the root tree item
     wxTreeItemId GetRootItem() const;
 
     // get the root tree item
     wxTreeItemId GetRootItem() const;


@@ -721,7 +724,7 @@ public:
             num = self->GetSelections(array);
             for (x=0; x < num; x++) {
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
             num = self->GetSelections(array);
             for (x=0; x < num; x++) {
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));

-                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), TRUE);
+                PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), True);

                 PyList_Append(rval, item);
             }
             wxPyEndBlockThreads();
                 PyList_Append(rval, item);
             }
             wxPyEndBlockThreads();


@@ -858,8 +861,8 @@ public:
     void UnselectAll();
 
     // select this item
     void UnselectAll();
 
     // select this item

-    void SelectItem(const wxTreeItemId& item, bool unselect_others=TRUE,
-                   bool extended_select=FALSE);
+    void SelectItem(const wxTreeItemId& item, bool unselect_others=True,
+                   bool extended_select=False);

 
     // make sure this item is visible (expanding the parent item and/or
     // scrolling to this item if necessary)
 
     // make sure this item is visible (expanding the parent item and/or
     // scrolling to this item if necessary)


@@ -873,7 +876,7 @@ public:
 
     %extend {
         // get the bounding rectangle of the item (or of its label only)
 
     %extend {
         // get the bounding rectangle of the item (or of its label only)

-        PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = FALSE) {
+        PyObject* GetBoundingRect(const wxTreeItemId& item, bool textOnly = False) {

             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
                 wxPyBeginBlockThreads();
             wxRect rect;
             if (self->GetBoundingRect(item, rect, textOnly)) {
                 wxPyBeginBlockThreads();