Added support for extra bitmap for toggled tool.
Implemented WarpPointer() and added a test for it to controls. Some minor documention updates. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxToolBarTool: public wxObject
|
||||
int theIndex = 0, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
|
||||
bool toggle = FALSE, wxObject *clientData = (wxObject *) NULL,
|
||||
const wxString& shortHelpString = "", const wxString& longHelpString = "",
|
||||
GtkWidget *item = (GtkWidget *) NULL );
|
||||
GtkWidget *pixmap = (GtkWidget *) NULL );
|
||||
#else
|
||||
wxToolBarTool(int theIndex, const wxBitmap& bitmap1 = wxNullBitmap, const wxBitmap& bitmap2 = wxNullBitmap,
|
||||
bool toggle = FALSE, long xPos = -1, long yPos = -1,
|
||||
@@ -75,6 +75,7 @@ public:
|
||||
#ifdef __WXGTK__
|
||||
wxToolBar *m_owner;
|
||||
GtkWidget *m_item;
|
||||
GtkWidget *m_pixmap;
|
||||
#endif
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user