Updates to match recent CVS changes.

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

diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i
index 03a28cfb5e06996aa4117394a8d244c55dc33319..d209ba87e751ca43928f2a72889b1c2e291cb35e 100644 (file)
--- a/wxPython/src/stattool.i
+++ b/wxPython/src/stattool.i
@@ -33,21 +33,30 @@
 %pragma(python) code = "import wx"
 
 
 %pragma(python) code = "import wx"
 
 

+//----------------------------------------------------------------------
+

 %{
 %{

-    static wxString wxPyEmptyStr("");
+    // Put some wx default wxChar* values into wxStrings.
+    DECLARE_DEF_STRING(StatusLineNameStr);
+    DECLARE_DEF_STRING(ToolBarNameStr);
+    static const wxString wxPyEmptyString(wxT(""));

 %}
 
 //---------------------------------------------------------------------------
 
 class wxStatusBar : public wxWindow {
 public:
 %}
 
 //---------------------------------------------------------------------------
 
 class wxStatusBar : public wxWindow {
 public:

-    wxStatusBar(wxWindow* parent, wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
+    wxStatusBar(wxWindow* parent, wxWindowID id = -1,
+                long style = wxST_SIZEGRIP,
+                const wxString& name = wxPyStatusLineNameStr);
+    %name(wxPreStatusBar)wxStatusBar();
+
+    bool Create(wxWindow* parent, wxWindowID id,

                 long style = wxST_SIZEGRIP,
                 long style = wxST_SIZEGRIP,

-                char* name = "statusBar");
+                const wxString& name = wxPyStatusLineNameStr);

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreStatusBar:val._setOORInfo(val)"

 
     %addmethods {
         %new wxRect* GetFieldRect(long item) {
 
     %addmethods {
         %new wxRect* GetFieldRect(long item) {


@@ -61,10 +70,6 @@ public:
     int GetBorderX();
     int GetBorderY();
 
     int GetBorderX();
     int GetBorderY();
 

-//      void DrawField(wxDC& dc, int i);
-//      void DrawFieldText(wxDC& dc, int i);
-//      void InitColours(void);
-

     void SetFieldsCount(int number = 1);
     void SetStatusText(const wxString& text, int i = 0);
     void SetStatusWidths(int LCOUNT, int* choices);
     void SetFieldsCount(int number = 1);
     void SetStatusText(const wxString& text, int i = 0);
     void SetStatusWidths(int LCOUNT, int* choices);


@@ -89,13 +94,13 @@ class wxToolBarToolBase : public wxObject {
 public:
 //      wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
 //                        int id = wxID_SEPARATOR,
 public:
 //      wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
 //                        int id = wxID_SEPARATOR,

-//                        const wxBitmap& bitmap1 = wxNullBitmap,
-//                        const wxBitmap& bitmap2 = wxNullBitmap,
-//                        bool toggle = FALSE,
+//                        const wxString& label = wxEmptyString,
+//                        const wxBitmap& bmpNormal = wxNullBitmap,
+//                        const wxBitmap& bmpDisabled = wxNullBitmap,
+//                        wxItemKind kind = wxITEM_NORMAL,

 //                        wxObject *clientData = (wxObject *) NULL,
 //                        const wxString& shortHelpString = wxEmptyString,
 //                        wxObject *clientData = (wxObject *) NULL,
 //                        const wxString& shortHelpString = wxEmptyString,

-//                        const wxString& longHelpString = wxEmptyString);
-//      wxToolBarToolBase(wxToolBarBase *tbar, wxControl *control);
+//                        const wxString& longHelpString = wxEmptyString)

 //      ~wxToolBarToolBase();
 
     %addmethods { void Destroy() { delete self; } }
 //      ~wxToolBarToolBase();
 
     %addmethods { void Destroy() { delete self; } }


@@ -107,21 +112,24 @@ public:
     int IsControl();
     int IsSeparator();
     int GetStyle();
     int IsControl();
     int IsSeparator();
     int GetStyle();

+    wxItemKind GetKind();

     bool IsEnabled();
     bool IsToggled();
     bool CanBeToggled();
     bool IsEnabled();
     bool IsToggled();
     bool CanBeToggled();

-    const wxBitmap& GetBitmap1();
-    const wxBitmap& GetBitmap2();
-    const wxBitmap& GetBitmap();
+    const wxBitmap& GetNormalBitmap();
+    const wxBitmap& GetDisabledBitmap();
+    wxBitmap GetBitmap();
+    wxString GetLabel();

     wxString GetShortHelp();
     wxString GetLongHelp();
     bool Enable(bool enable);
     wxString GetShortHelp();
     wxString GetLongHelp();
     bool Enable(bool enable);

-    bool Toggle(bool toggle);
+    void Toggle();

     bool SetToggle(bool toggle);
     bool SetShortHelp(const wxString& help);
     bool SetLongHelp(const wxString& help);
     bool SetToggle(bool toggle);
     bool SetShortHelp(const wxString& help);
     bool SetLongHelp(const wxString& help);

-    void SetBitmap1(const wxBitmap& bmp);
-    void SetBitmap2(const wxBitmap& bmp);
+    void SetNormalBitmap(const wxBitmap& bmp);
+    void SetDisabledBitmap(const wxBitmap& bmp);
+    void SetLabel(const wxString& label);

     void Detach();
     void Attach(wxToolBarBase *tbar);
 
     void Detach();
     void Attach(wxToolBarBase *tbar);
 


@@ -143,6 +151,13 @@ public:
             self->SetClientData(new wxPyUserData(clientData));
         }
     }
             self->SetClientData(new wxPyUserData(clientData));
         }
     }

+
+    %pragma(python) addtoclass="
+    GetBitmap1 = GetNormalBitmap
+    GetBitmap2 = GetDisabledBitmap
+    SetBitmap1 = SetNormalBitmap
+    SetBitmap2 = SetDisabledBitmap
+    "

 };
 
 
 };
 
 


@@ -153,57 +168,102 @@ public:
     // This is an Abstract Base Class
 
     %addmethods {
     // This is an Abstract Base Class
 
     %addmethods {

-        // wrap ClientData in a class that knows about PyObjects
+
+        // the full AddTool() function
+        //
+        // If bmpDisabled is wxNullBitmap, a shadowed version of the normal bitmap
+        // is created and used as the disabled image.

         wxToolBarToolBase *AddTool(int id,
         wxToolBarToolBase *AddTool(int id,

+                                   const wxString& label,

                                    const wxBitmap& bitmap,
                                    const wxBitmap& bitmap,

-                                   const wxBitmap& pushedBitmap = wxNullBitmap,
-                                   int isToggle = FALSE,
-                                   PyObject *clientData = NULL,
-                                   const wxString& shortHelpString = wxPyEmptyStr,
-                                   const wxString& longHelpString = wxPyEmptyStr) {
+                                   const wxBitmap& bmpDisabled,
+                                   wxItemKind kind = wxITEM_NORMAL,
+                                   const wxString& shortHelp = wxPyEmptyString,
+                                   const wxString& longHelp = wxPyEmptyString,
+                                   PyObject *clientData = NULL)
+        {

             wxPyUserData* udata = NULL;
             if (clientData)
                 udata = new wxPyUserData(clientData);
             wxPyUserData* udata = NULL;
             if (clientData)
                 udata = new wxPyUserData(clientData);

-            return self->AddTool(id, bitmap, pushedBitmap, (bool)isToggle,
-                                 udata, shortHelpString, longHelpString);
+            return self->AddTool(id, label, bitmap, bmpDisabled, kind,
+                                 shortHelp, longHelp, udata);

         }
 
         }
 

-        // This one is easier to use...
+        // The most common version of AddTool

         wxToolBarToolBase *AddSimpleTool(int id,
         wxToolBarToolBase *AddSimpleTool(int id,

+                                         const wxString& label,

                                          const wxBitmap& bitmap,
                                          const wxBitmap& bitmap,

-                                         const wxString& shortHelpString = wxPyEmptyStr,
-                                         const wxString& longHelpString = wxPyEmptyStr,
-                                         int isToggle = FALSE) {
-            return self->AddTool(id, bitmap, wxNullBitmap, isToggle, NULL,
-                                 shortHelpString, longHelpString);
+                                         const wxString& shortHelp = wxPyEmptyString,
+                                         const wxString& longHelp = wxPyEmptyString,
+                                         wxItemKind kind = wxITEM_NORMAL)
+        {
+            return self->AddTool(id, label, bitmap, wxNullBitmap, kind,
+                                 shortHelp, longHelp, NULL);

         }
 
         }
 

+        // add a check tool, i.e. a tool which can be toggled
+        wxToolBarToolBase *AddCheckTool(int id,
+                                        const wxString& label,
+                                        const wxBitmap& bitmap,
+                                        const wxBitmap& bmpDisabled = wxNullBitmap,
+                                        const wxString& shortHelp = wxEmptyString,
+                                        const wxString& longHelp = wxEmptyString,
+                                        PyObject *clientData = NULL)
+        {
+            wxPyUserData* udata = NULL;
+            if (clientData)
+                udata = new wxPyUserData(clientData);
+            return self->AddCheckTool(id, label, bitmap, bmpDisabled,
+                                      shortHelp, longHelp, udata);
+        }
+
+        // add a radio tool, i.e. a tool which can be toggled and releases any
+        // other toggled radio tools in the same group when it happens
+        wxToolBarToolBase *AddRadioTool(int id,
+                                    const wxString& label,
+                                    const wxBitmap& bitmap,
+                                    const wxBitmap& bmpDisabled = wxNullBitmap,
+                                    const wxString& shortHelp = wxEmptyString,
+                                    const wxString& longHelp = wxEmptyString,
+                                    PyObject *clientData = NULL)
+        {
+            wxPyUserData* udata = NULL;
+            if (clientData)
+                udata = new wxPyUserData(clientData);
+            return self->AddRadioTool(id, label, bitmap, bmpDisabled,
+                                      shortHelp, longHelp, udata);
+        }

 
 

-        // wrap ClientData in a class that knows about PyObjects
+        // insert the new tool at the given position, if pos == GetToolsCount(), it
+        // is equivalent to AddTool()

         wxToolBarToolBase *InsertTool(size_t pos,
                                       int id,
         wxToolBarToolBase *InsertTool(size_t pos,
                                       int id,

+                                      const wxString& label,

                                       const wxBitmap& bitmap,
                                       const wxBitmap& bitmap,

-                                      const wxBitmap& pushedBitmap = wxNullBitmap,
-                                      int isToggle = FALSE,
-                                      PyObject *clientData = NULL,
-                                      const wxString& shortHelpString = wxPyEmptyStr,
-                                      const wxString& longHelpString = wxPyEmptyStr) {
+                                      const wxBitmap& bmpDisabled = wxNullBitmap,
+                                      wxItemKind kind = wxITEM_NORMAL,
+                                      const wxString& shortHelp = wxEmptyString,
+                                      const wxString& longHelp = wxEmptyString,
+                                      PyObject *clientData = NULL)
+        {

             wxPyUserData* udata = NULL;
             if (clientData)
                 udata = new wxPyUserData(clientData);
             wxPyUserData* udata = NULL;
             if (clientData)
                 udata = new wxPyUserData(clientData);

-            return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)isToggle,
-                                    udata, shortHelpString, longHelpString);
+            return self->InsertTool(pos, id, label, bitmap, bmpDisabled, kind,
+                                    shortHelp, longHelp, udata);

         }
 
         }
 

-        // This one is easier to use...
+        // A simpler InsertTool

         wxToolBarToolBase *InsertSimpleTool(size_t pos,
         wxToolBarToolBase *InsertSimpleTool(size_t pos,

-                                            int id,
-                                            const wxBitmap& bitmap,
-                                            const wxString& shortHelpString = wxPyEmptyStr,
-                                            const wxString& longHelpString = wxPyEmptyStr,
-                                            int isToggle = FALSE) {
-            return self->InsertTool(pos, id, bitmap, wxNullBitmap, isToggle, NULL,
-                                    shortHelpString, longHelpString);
+                                      int id,
+                                      const wxString& label,
+                                      const wxBitmap& bitmap,
+                                      wxItemKind kind = wxITEM_NORMAL,
+                                      const wxString& shortHelp = wxEmptyString,
+                                      const wxString& longHelp = wxEmptyString)
+        {
+            return self->InsertTool(pos, id, label, bitmap, wxNullBitmap, kind,
+                                    shortHelp, longHelp);

         }
     }
 
         }
     }
 


@@ -228,8 +288,8 @@ public:
 
     %addmethods {
         // convert the ClientData back to a PyObject
 
     %addmethods {
         // convert the ClientData back to a PyObject

-        PyObject* GetToolClientData(int index) {
-            wxPyUserData* udata = (wxPyUserData*)self->GetToolClientData(index);
+        PyObject* GetToolClientData(int id) {
+            wxPyUserData* udata = (wxPyUserData*)self->GetToolClientData(id);

             if (udata) {
                 Py_INCREF(udata->m_obj);
                 return udata->m_obj;
             if (udata) {
                 Py_INCREF(udata->m_obj);
                 return udata->m_obj;


@@ -239,8 +299,8 @@ public:
             }
         }
 
             }
         }
 

-        void SetToolClientData(int index, PyObject* clientData) {
-            self->SetToolClientData(index, new wxPyUserData(clientData));
+        void SetToolClientData(int id, PyObject* clientData) {
+            self->SetToolClientData(id, new wxPyUserData(clientData));

         }
     }
 
         }
     }
 


@@ -270,6 +330,12 @@ public:
     wxSize GetToolBitmapSize();
     wxSize GetToolSize();
 
     wxSize GetToolBitmapSize();
     wxSize GetToolSize();
 

+    // returns a (non separator) tool containing the point (x, y) or NULL if
+    // there is no tool at this point (corrdinates are client)
+    wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
+
+    // return TRUE if this is a vertical toolbar, otherwise FALSE
+    bool IsVertical();

 };
 
 
 };
 
 


@@ -282,9 +348,18 @@ public:
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = wxNO_BORDER | wxTB_HORIZONTAL,

-              const char* name = wxToolBarNameStr);
+              const wxString& name = wxPyToolBarNameStr);
+    %name(wxPreToolBar)wxToolBar();

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    bool Create(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxNO_BORDER | wxTB_HORIZONTAL,
+              const wxString& name = wxPyToolBarNameStr);
+
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreToolBar:val._setOORInfo(val)"

 
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 };
 
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 };


@@ -299,9 +374,18 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxNO_BORDER | wxTB_HORIZONTAL,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize,
                     long style = wxNO_BORDER | wxTB_HORIZONTAL,

-                    const char* name = wxToolBarNameStr);
+                    const wxString& name = wxPyToolBarNameStr);
+    %name(wxPreToolBarSimple)wxToolBarSimple();
+
+    bool Create(wxWindow *parent,
+                    wxWindowID id,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                    const wxString& name = wxPyToolBarNameStr);

 
 

-    %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+    %pragma(python) addtomethod = "wxPreToolBarSimple:val._setOORInfo(val)"

 
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 };
 
     wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
 };