X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9cbf6f6ea3ce56a15841a4f773bffef71c92c398..71aba8333cc915afff9e740c944f7fa7247abacb:/wxPython/src/stattool.i diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i index e2b4183a11..e8a592d9df 100644 --- a/wxPython/src/stattool.i +++ b/wxPython/src/stattool.i @@ -16,7 +16,6 @@ %{ #include "helpers.h" #include -#include %} //---------------------------------------------------------------------- @@ -91,6 +90,20 @@ enum wxToolBarToolStyle wxTOOL_STYLE_CONTROL }; +enum { + wxTB_HORIZONTAL, + wxTB_VERTICAL, + wxTB_3DBUTTONS, + wxTB_FLAT, + wxTB_DOCKABLE, + wxTB_NOICONS, + wxTB_TEXT, + wxTB_NODIVIDER, + wxTB_NOALIGN, + wxTB_HORZ_LAYOUT, + wxTB_HORZ_TEXT, +}; + class wxToolBarToolBase : public wxObject { @@ -382,6 +395,8 @@ public: } } + // returns tool pos, or wxNOT_FOUND if tool isn't found + int GetToolPos(int id) const; bool GetToolState(int id); bool GetToolEnabled(int id); @@ -445,28 +460,28 @@ public: -class wxToolBarSimple : public wxToolBarBase { -public: - wxToolBarSimple(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxNO_BORDER | wxTB_HORIZONTAL, - const wxString& name = wxPyToolBarNameStr); - %name(wxPreToolBarSimple)wxToolBarSimple(); +// class wxToolBarSimple : public wxToolBarBase { +// public: +// wxToolBarSimple(wxWindow *parent, +// wxWindowID id, +// const wxPoint& pos = wxDefaultPosition, +// const wxSize& size = wxDefaultSize, +// long style = wxNO_BORDER | wxTB_HORIZONTAL, +// 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); +// 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 = "wxPreToolBarSimple:val._setOORInfo(val)" +// %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); +// }; //--------------------------------------------------------------------------- //---------------------------------------------------------------------------