X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..4649b5eded522cdc6d76aae074f98a2c162fd648:/wxPython/src/stattool.i?ds=sidebyside diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i index 37702d31f4..1a6482b228 100644 --- a/wxPython/src/stattool.i +++ b/wxPython/src/stattool.i @@ -32,13 +32,23 @@ %pragma(python) code = "import wx" + +%{ + static wxString wxPyEmptyStr(""); +%} + //--------------------------------------------------------------------------- class wxStatusBar : public wxWindow { public: wxStatusBar(wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxPyDefaultPosition, - const wxSize& size = wxPyDefaultSize, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxST_SIZEGRIP, + char* name = "statusBar"); + %name(wxPreStatusBar)wxStatusBar(); + + bool Create(wxWindow* parent, wxWindowID id, long style = wxST_SIZEGRIP, char* name = "statusBar"); @@ -56,10 +66,6 @@ public: 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); @@ -80,7 +86,7 @@ enum wxToolBarToolStyle -class wxToolBarToolBase { +class wxToolBarToolBase : public wxObject { public: // wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL, // int id = wxID_SEPARATOR, @@ -152,14 +158,14 @@ public: wxToolBarToolBase *AddTool(int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, - int toggle = FALSE, + int isToggle = 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, + return self->AddTool(id, bitmap, pushedBitmap, (bool)isToggle, udata, shortHelpString, longHelpString); } @@ -168,8 +174,8 @@ public: const wxBitmap& bitmap, const wxString& shortHelpString = wxPyEmptyStr, const wxString& longHelpString = wxPyEmptyStr, - int toggle = FALSE) { - return self->AddTool(id, bitmap, wxNullBitmap, toggle, NULL, + int isToggle = FALSE) { + return self->AddTool(id, bitmap, wxNullBitmap, isToggle, NULL, shortHelpString, longHelpString); } @@ -179,14 +185,14 @@ public: int id, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap, - int toggle = FALSE, + int isToggle = 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, + return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)isToggle, udata, shortHelpString, longHelpString); } @@ -196,8 +202,8 @@ public: const wxBitmap& bitmap, const wxString& shortHelpString = wxPyEmptyStr, const wxString& longHelpString = wxPyEmptyStr, - int toggle = FALSE) { - return self->InsertTool(pos, id, bitmap, wxNullBitmap, toggle, NULL, + int isToggle = FALSE) { + return self->InsertTool(pos, id, bitmap, wxNullBitmap, isToggle, NULL, shortHelpString, longHelpString); } } @@ -252,6 +258,7 @@ public: void SetToolPacking(int packing); void SetToolSeparation(int separation); wxSize GetToolMargins(); + wxSize GetMargins(); int GetToolPacking(); int GetToolSeparation(); @@ -273,8 +280,16 @@ class wxToolBar : public wxToolBarBase { public: wxToolBar(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxPyDefaultPosition, - const wxSize& size = wxPyDefaultSize, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxNO_BORDER | wxTB_HORIZONTAL, + const char* name = wxToolBarNameStr); + %name(wxPreToolBar)wxToolBar(); + + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const char* name = wxToolBarNameStr); @@ -290,8 +305,16 @@ class wxToolBarSimple : public wxToolBarBase { public: wxToolBarSimple(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxPyDefaultPosition, - const wxSize& size = wxPyDefaultSize, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxNO_BORDER | wxTB_HORIZONTAL, + const char* name = wxToolBarNameStr); + %name(wxPreToolBarSimple)wxToolBarSimple(); + + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const char* name = wxToolBarNameStr); @@ -301,120 +324,5 @@ public: }; //--------------------------------------------------------------------------- - - - -#ifdef THE_OLD_ONE - -class wxToolBarTool { -public: - wxToolBarTool(); - ~wxToolBarTool(); - void SetSize( long w, long h ) - long GetWidth (); - long GetHeight (); - wxControl *GetControl(); - -public: - int m_toolStyle; - wxObject * m_clientData; - int m_index; - long m_x; - long m_y; - long m_width; - long m_height; - bool m_toggleState; - bool m_isToggle; - bool m_deleteSecondBitmap; - bool m_enabled; - wxBitmap m_bitmap1; - wxBitmap m_bitmap2; - bool m_isMenuCommand; - wxString m_shortHelpString; - wxString m_longHelpString; -}; - - - -// class wxToolBarBase : public wxControl { -// public: - -class wxToolBar : public wxControl { -public: - wxToolBar(wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxPyDefaultPosition, - const wxSize& size = wxPyDefaultSize, - long style = wxTB_HORIZONTAL | wxNO_BORDER, - char* name = "toolBar"); - - %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)" - - - bool AddControl(wxControl * control); - void AddSeparator(); - void ClearTools(); - - // Ignoge the clientData for now... - %addmethods { - wxToolBarTool* AddTool(int toolIndex, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2 = wxNullBitmap, - int isToggle = FALSE, - long xPos = -1, - long yPos = -1, - //wxObject* clientData = NULL, - const wxString& shortHelpString = wxPyEmptyStr, - const wxString& longHelpString = wxPyEmptyStr) { - return self->AddTool(toolIndex, bitmap1, bitmap2, - isToggle, xPos, yPos, NULL, - shortHelpString, longHelpString); - } - - wxToolBarTool* AddSimpleTool(int toolIndex, - const wxBitmap& bitmap, - const wxString& shortHelpString = wxPyEmptyStr, - const wxString& longHelpString = wxPyEmptyStr) { - return self->AddTool(toolIndex, bitmap, wxNullBitmap, - FALSE, -1, -1, NULL, - shortHelpString, longHelpString); - } - } - - - void EnableTool(int toolIndex, bool enable); -#ifdef __WXMSW__ - wxToolBarTool* FindToolForPosition(long x, long y); - wxSize GetToolSize(); - wxSize GetToolBitmapSize(); - void SetToolBitmapSize(const wxSize& size); - wxSize GetMaxSize(); -#endif - wxSize GetToolMargins(); -// wxObject* GetToolClientData(int toolIndex); - bool GetToolEnabled(int toolIndex); - wxString GetToolLongHelp(int toolIndex); - int GetToolPacking(); - int GetToolSeparation(); - wxString GetToolShortHelp(int toolIndex); - bool GetToolState(int toolIndex); - - - bool Realize(); - - void SetToolLongHelp(int toolIndex, const wxString& helpString); - void SetToolShortHelp(int toolIndex, const wxString& helpString); - void SetMargins(const wxSize& size); - void SetToolPacking(int packing); - void SetToolSeparation(int separation); - void ToggleTool(int toolIndex, const bool toggle); - void SetToggle(int toolIndex, bool toggle); - void SetMaxRowsCols(int rows, int cols); - int GetMaxRows(); - int GetMaxCols(); -}; - - -#endif - //---------------------------------------------------------------------------