X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b68dc582b8c6dd32ef9f0a4ec91573bd5cc0296a..ef1cae87cd4102bef46712f64f06fcd102ae9eee:/wxPython/src/stattool.i?ds=sidebyside diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i index f2e16f4f69..55f29ef21d 100644 --- a/wxPython/src/stattool.i +++ b/wxPython/src/stattool.i @@ -33,21 +33,21 @@ %pragma(python) code = "import wx" -%{ - static wxString wxPyEmptyStr(""); -%} - //--------------------------------------------------------------------------- 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, char* name = "statusBar"); + %name(wxPreStatusBar)wxStatusBar(); - %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)" + bool Create(wxWindow* parent, wxWindowID id, + long style = wxST_SIZEGRIP, + char* name = "statusBar"); + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreStatusBar:val._setOORInfo(val)" %addmethods { %new wxRect* GetFieldRect(long item) { @@ -61,10 +61,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); @@ -85,7 +81,7 @@ enum wxToolBarToolStyle -class wxToolBarToolBase { +class wxToolBarToolBase : public wxObject { public: // wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL, // int id = wxID_SEPARATOR, @@ -110,18 +106,20 @@ public: 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); - bool Toggle(bool toggle); + void 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 SetNormalBitmap(const wxBitmap& bmp); + void SetDisabledBitmap(const wxBitmap& bmp); + void SetLabel(const wxString& label); void Detach(); void Attach(wxToolBarBase *tbar); @@ -143,6 +141,13 @@ public: self->SetClientData(new wxPyUserData(clientData)); } } + + %pragma(python) addtoclass=" + GetBitmap1 = GetNormalBitmap + GetBitmap2 = GetDisabledBitmap + SetBitmap1 = SetNormalBitmap + SetBitmap2 = SetDisabledBitmap + " }; @@ -159,8 +164,8 @@ public: const wxBitmap& pushedBitmap = wxNullBitmap, int isToggle = FALSE, PyObject *clientData = NULL, - const wxString& shortHelpString = wxPyEmptyStr, - const wxString& longHelpString = wxPyEmptyStr) { + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString) { wxPyUserData* udata = NULL; if (clientData) udata = new wxPyUserData(clientData); @@ -171,8 +176,8 @@ public: // This one is easier to use... wxToolBarToolBase *AddSimpleTool(int id, const wxBitmap& bitmap, - const wxString& shortHelpString = wxPyEmptyStr, - const wxString& longHelpString = wxPyEmptyStr, + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString, int isToggle = FALSE) { return self->AddTool(id, bitmap, wxNullBitmap, isToggle, NULL, shortHelpString, longHelpString); @@ -186,8 +191,8 @@ public: const wxBitmap& pushedBitmap = wxNullBitmap, int isToggle = FALSE, PyObject *clientData = NULL, - const wxString& shortHelpString = wxPyEmptyStr, - const wxString& longHelpString = wxPyEmptyStr) { + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString) { wxPyUserData* udata = NULL; if (clientData) udata = new wxPyUserData(clientData); @@ -199,8 +204,8 @@ public: wxToolBarToolBase *InsertSimpleTool(size_t pos, int id, const wxBitmap& bitmap, - const wxString& shortHelpString = wxPyEmptyStr, - const wxString& longHelpString = wxPyEmptyStr, + const wxString& shortHelpString = wxEmptyString, + const wxString& longHelpString = wxEmptyString, int isToggle = FALSE) { return self->InsertTool(pos, id, bitmap, wxNullBitmap, isToggle, NULL, shortHelpString, longHelpString); @@ -228,8 +233,8 @@ public: %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; @@ -239,8 +244,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)); } } @@ -257,6 +262,7 @@ public: void SetToolPacking(int packing); void SetToolSeparation(int separation); wxSize GetToolMargins(); + wxSize GetMargins(); int GetToolPacking(); int GetToolSeparation(); @@ -269,6 +275,12 @@ public: 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,8 +294,17 @@ public: const wxSize& size = wxDefaultSize, long style = wxNO_BORDER | wxTB_HORIZONTAL, const char* name = wxToolBarNameStr); + %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 char* name = wxToolBarNameStr); + + %pragma(python) addtomethod = "__init__:self._setOORInfo(self)" + %pragma(python) addtomethod = "wxPreToolBar:val._setOORInfo(val)" wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y); }; @@ -299,127 +320,21 @@ public: 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); - %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); }; //--------------------------------------------------------------------------- - - - -#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 = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - 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 - //---------------------------------------------------------------------------