Added wxEvtHandler::Disconect()

Added wxToolBar::DeleteTool()
  Removed the WXWIN_COMP... defines from the common setup.h
  Some tests,


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-18 15:58:35 +00:00
parent 61b04ac652
commit 97d7bfb8b4
12 changed files with 135 additions and 69 deletions

View File

@@ -1380,6 +1380,16 @@ public:
wxObject *userData = (wxObject *) NULL )
{ Connect(id, -1, eventType, func, userData); }
bool Disconnect( int id, int lastId = -1, wxEventType eventType = wxEVT_NULL,
wxObjectEventFunction func = NULL,
wxObject *userData = (wxObject *) NULL );
// Convenience function: take just one id
bool Disconnect( int id, wxEventType eventType = wxEVT_NULL,
wxObjectEventFunction func = NULL,
wxObject *userData = (wxObject *) NULL )
{ return Disconnect(id, -1, eventType, func, userData); }
// implementation from now on
virtual bool SearchEventTable(wxEventTable& table, wxEvent& event);
bool SearchDynamicEventTable( wxEvent& event );

View File

@@ -83,8 +83,13 @@ public:
// Add space
virtual void AddSeparator();
// Delete tool by index (=id)
virtual bool DeleteTool(int toolIndex);
// Delete all tools
virtual void ClearTools();
// Has to be called after adding tools or changing something
virtual bool Realize();
virtual void EnableTool(int toolIndex, bool enable);

View File

@@ -83,8 +83,13 @@ public:
// Add space
virtual void AddSeparator();
// Delete tool by index (=id)
virtual bool DeleteTool(int toolIndex);
// Delete all tools
virtual void ClearTools();
// Has to be called after adding tools or changing something
virtual bool Realize();
virtual void EnableTool(int toolIndex, bool enable);

View File

@@ -33,45 +33,5 @@
#include "wx/gtk/setup.h"
#endif
/*
* Compatibility defines: note that, in general, there is a a reason for not
* compatible changes, so you should try to avoid defining WXWIN_COMPATIBILITY
* and do so only if your program really can't be compiled otherwise.
*/
/*
* Compatibility with 1.66 API.
* Level 0: no backward compatibility, all new features
* Level 1: wxDC, OnSize (etc.) compatibility, but
* some new features such as event tables
*/
#define WXWIN_COMPATIBILITY 0
/*
* wxWindows 2.0 API compatibility. Possible values are:
* 0: no backwards compatibility
* 1: some backwards compatibility, but if it conflicts with the new
* features, use the new code, not the old one
* 2: maximum backwards compatiblity: even if compatibility can only be
* achieved by disabling new features, do it.
*/
#define WXWIN_COMPATIBILITY_2 1
/*
* wxWindows 2.0 uses long for wxPoint/wxRect/wxSize member fields and wxDC
* method arguments, wxWindows 2.1 and later uses wxCoord typedef which is
* usually int. Using long leads to (justified) warnings about long to int
* conversions from some compilers and is, generally speaking, unneeded.
*/
#define wxUSE_COMPATIBLE_COORD_TYPES 0
/*
* Maximum compatibility with 2.0 API
*/
#if WXWIN_COMPATIBILITY_2 == 2
#undef wxUSE_COMPATIBLE_COORD_TYPES
#define wxUSE_COMPATIBLE_COORD_TYPES 1
#endif /* WXWIN_COMPATIBILITY_2_MAX */
#endif
/* _WX_SETUP_H_BASE_ */