New toolbar wrappers

wxMask demos
GenericButton now derives from wxControl
Lots of small changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/src/stattool.i

@@ -65,13 +65,250 @@ public:
 
 //---------------------------------------------------------------------------
 
+class wxToolBarBase;
+
+enum wxToolBarToolStyle
+{
+    wxTOOL_STYLE_BUTTON    = 1,
+    wxTOOL_STYLE_SEPARATOR = 2,
+    wxTOOL_STYLE_CONTROL
+};
+
+
+
+class wxToolBarToolBase {
+public:
+//      wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
+//                        int id = wxID_SEPARATOR,
+//                        const wxBitmap& bitmap1 = wxNullBitmap,
+//                        const wxBitmap& bitmap2 = wxNullBitmap,
+//                        bool toggle = FALSE,
+//                        wxObject *clientData = (wxObject *) NULL,
+//                        const wxString& shortHelpString = wxEmptyString,
+//                        const wxString& longHelpString = wxEmptyString);
+//      wxToolBarToolBase(wxToolBarBase *tbar, wxControl *control);
+//      ~wxToolBarToolBase();
+
+    %addmethods { void Destroy() { delete self; } }
+
+    int GetId();
+    wxControl *GetControl();
+    wxToolBarBase *GetToolBar();
+    int IsButton();
+    int IsControl();
+    int IsSeparator();
+    int GetStyle();
+    bool IsEnabled();
+    bool IsToggled();
+    bool CanBeToggled();
+    const wxBitmap& GetBitmap1();
+    const wxBitmap& GetBitmap2();
+    const wxBitmap& GetBitmap();
+    wxString GetShortHelp();
+    wxString GetLongHelp();
+    bool Enable(bool enable);
+    bool Toggle(bool toggle);
+    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 Detach();
+    void Attach(wxToolBarBase *tbar);
+
+    //wxObject *GetClientData();
+    %addmethods {
+        // convert the ClientData back to a PyObject
+        PyObject* GetClientData() {
+            wxPyUserData* udata = (wxPyUserData*)self->GetClientData();
+            if (udata) {
+                Py_INCREF(udata->m_obj);
+                return udata->m_obj;
+            } else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+
+        void SetClientData(PyObject* clientData) {
+            self->SetClientData(new wxPyUserData(clientData));
+        }
+    }
+};
+
+
+
+class wxToolBarBase : public wxControl {
+public:
+
+    // This is an Abstract Base Class
+
+    %addmethods {
+        // wrap ClientData in a class that knows about PyObjects
+        wxToolBarToolBase *AddTool(int id,
+                                   const wxBitmap& bitmap,
+                                   const wxBitmap& pushedBitmap = wxNullBitmap,
+                                   int toggle = FALSE,
+                                   PyObject *clientData = NULL,
+                                   const wxString& shortHelpString = wxPyEmptyStr,
+                                   const wxString& longHelpString = wxPyEmptyStr) {
+            wxPyUserData* udata = NULL;
+            if (clientData)
+                udata = new wxPyUserData(clientData);
+            return self->AddTool(id, bitmap, pushedBitmap, (bool)toggle,
+                                 udata, shortHelpString, longHelpString);
+        }
+
+        // This one is easier to use...
+        wxToolBarToolBase *AddSimpleTool(int id,
+                                         const wxBitmap& bitmap,
+                                         const wxString& shortHelpString = wxPyEmptyStr,
+                                         const wxString& longHelpString = wxPyEmptyStr,
+                                         int toggle = FALSE) {
+            return self->AddTool(id, bitmap, wxNullBitmap, toggle, NULL,
+                                 shortHelpString, longHelpString);
+        }
+
+
+        // wrap ClientData in a class that knows about PyObjects
+        wxToolBarToolBase *InsertTool(size_t pos,
+                                      int id,
+                                      const wxBitmap& bitmap,
+                                      const wxBitmap& pushedBitmap = wxNullBitmap,
+                                      int toggle = FALSE,
+                                      PyObject *clientData = NULL,
+                                      const wxString& shortHelpString = wxPyEmptyStr,
+                                      const wxString& longHelpString = wxPyEmptyStr) {
+            wxPyUserData* udata = NULL;
+            if (clientData)
+                udata = new wxPyUserData(clientData);
+            return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)toggle,
+                                    udata, shortHelpString, longHelpString);
+        }
+
+        // This one is easier to use...
+        wxToolBarToolBase *InsertSimpleTool(size_t pos,
+                                            int id,
+                                            const wxBitmap& bitmap,
+                                            const wxString& shortHelpString = wxPyEmptyStr,
+                                            const wxString& longHelpString = wxPyEmptyStr,
+                                            int toggle = FALSE) {
+            return self->InsertTool(pos, id, bitmap, wxNullBitmap, toggle, NULL,
+                                    shortHelpString, longHelpString);
+        }
+    }
+
+
+    wxToolBarToolBase *AddControl(wxControl *control);
+    wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
+
+    wxToolBarToolBase *AddSeparator();
+    wxToolBarToolBase *InsertSeparator(size_t pos);
+
+    wxToolBarToolBase *RemoveTool(int id);
+
+    bool DeleteToolByPos(size_t pos);
+    bool DeleteTool(int id);
+    void ClearTools();
+    bool Realize();
+
+    void EnableTool(int id, bool enable);
+    void ToggleTool(int id, bool toggle);
+    void SetToggle(int id, bool toggle);
+
+
+    %addmethods {
+        // convert the ClientData back to a PyObject
+        PyObject* GetToolClientData(int index) {
+            wxPyUserData* udata = (wxPyUserData*)self->GetToolClientData(index);
+            if (udata) {
+                Py_INCREF(udata->m_obj);
+                return udata->m_obj;
+            } else {
+                Py_INCREF(Py_None);
+                return Py_None;
+            }
+        }
+
+        void SetToolClientData(int index, PyObject* clientData) {
+            self->SetToolClientData(index, new wxPyUserData(clientData));
+        }
+    }
+
+
+    bool GetToolState(int id);
+    bool GetToolEnabled(int id);
+    void SetToolShortHelp(int id, const wxString& helpString);
+    wxString GetToolShortHelp(int id);
+    void SetToolLongHelp(int id, const wxString& helpString);
+    wxString GetToolLongHelp(int id);
+
+    %name(SetMarginsXY) void SetMargins(int x, int y);
+    void SetMargins(const wxSize& size);
+    void SetToolPacking(int packing);
+    void SetToolSeparation(int separation);
+    wxSize GetToolMargins();
+    int GetToolPacking();
+    int GetToolSeparation();
+
+    void SetRows(int nRows);
+    void SetMaxRowsCols(int rows, int cols);
+    int GetMaxRows();
+    int GetMaxCols();
+
+    void SetToolBitmapSize(const wxSize& size);
+    wxSize GetToolBitmapSize();
+    wxSize GetToolSize();
+
+};
+
+
+
+
+class wxToolBar : public wxToolBarBase {
+public:
+    wxToolBar(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxPyDefaultPosition,
+              const wxSize& size = wxPyDefaultSize,
+              long style = wxNO_BORDER | wxTB_HORIZONTAL,
+              const wxString& name = wxToolBarNameStr);
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
+    wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
+};
+
+
+
+
+class wxToolBarSimple : public wxToolBarBase {
+public:
+    wxToolBarSimple(wxWindow *parent,
+                    wxWindowID id,
+                    const wxPoint& pos = wxPyDefaultPosition,
+                    const wxSize& size = wxPyDefaultSize,
+                    long style = wxNO_BORDER | wxTB_HORIZONTAL,
+                    const wxString& name = wxToolBarNameStr);
+
+    %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
+
+    wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
+};
+
+//---------------------------------------------------------------------------
+
+
+
+#ifdef THE_OLD_ONE
+
 class wxToolBarTool {
 public:
     wxToolBarTool();
     ~wxToolBarTool();
-    void SetSize( long w, long h ) { m_width = w; m_height = h; }
-    long GetWidth () const { return m_width; }
-    long GetHeight () const { return m_height; }
+    void SetSize( long w, long h )
+    long GetWidth ();
+    long GetHeight ();
     wxControl *GetControl();
 
 public:
@@ -166,13 +403,14 @@ public:
     void SetToolPacking(int packing);
     void SetToolSeparation(int separation);
     void ToggleTool(int toolIndex, const bool toggle);
-#ifdef __WXMSW__
     void SetToggle(int toolIndex, bool toggle);
     void SetMaxRowsCols(int rows, int cols);
     int GetMaxRows();
     int GetMaxCols();
-#endif
 };
 
+
+#endif
+
 //---------------------------------------------------------------------------