Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

'Compatibility' fix for connecting events.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-16 18:02:48 +00:00
parent 7fc24fb152
commit 432968bf3d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/event.h
View File

@@ -49,6 +49,8 @@ class WXDLLIMPEXP_BASE wxList;
class WXDLLIMPEXP_CORE wxWindowBase; class WXDLLIMPEXP_CORE wxWindowBase;
#endif // wxUSE_GUI #endif // wxUSE_GUI
class WXDLLIMPEXP_BASE wxEvtHandler;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Event types // Event types
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -2095,7 +2097,7 @@ private:
// event handler and related classes // event handler and related classes
// ============================================================================ // ============================================================================
typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); typedef void (wxEvtHandler::*wxObjectEventFunction)(wxEvent&);
// we can't have ctors nor base struct in backwards compatibility mode or // we can't have ctors nor base struct in backwards compatibility mode or
// otherwise we won't be able to initialize the objects with an agregate, so // otherwise we won't be able to initialize the objects with an agregate, so

13
include/wx/xti.h
View File

@@ -90,8 +90,9 @@ class WXDLLIMPEXP_BASE wxDynamicClassInfo;
class WXDLLIMPEXP_BASE wxHashTable; class WXDLLIMPEXP_BASE wxHashTable;
class WXDLLIMPEXP_BASE wxObjectRefData; class WXDLLIMPEXP_BASE wxObjectRefData;
class WXDLLIMPEXP_BASE wxEvent; class WXDLLIMPEXP_BASE wxEvent;
class WXDLLIMPEXP_BASE wxEvtHandler;
typedef void (wxObject::*wxObjectEventFunction)(wxEvent&); typedef void (wxEvtHandler::*wxObjectEventFunction)(wxEvent&);
#if wxUSE_FUNC_TEMPLATE_POINTER #if wxUSE_FUNC_TEMPLATE_POINTER
# define wxTO_STRING(type) wxToStringConverter<type> # define wxTO_STRING(type) wxToStringConverter<type>
@@ -243,7 +244,7 @@ void wxSetToString( wxString &s , const wxBitset<e> &data )
if ( data.test( value ) ) if ( data.test( value ) )
{ {
// this could also be done by the templated calls // this could also be done by the templated calls
if ( !s.IsEmpty() ) if ( !s.empty() )
s +=wxT("|") ; s +=wxT("|") ;
s += edata->GetEnumMemberNameByIndex(i) ; s += edata->GetEnumMemberNameByIndex(i) ;
} }
@@ -303,7 +304,7 @@ void wxFlagsToString( wxString &s , const e& data )
// clear the flags we just set // clear the flags we just set
dataValue &= ~value ; dataValue &= ~value ;
// this could also be done by the templated calls // this could also be done by the templated calls
if ( !s.IsEmpty() ) if ( !s.empty() )
s +=wxT("|") ; s +=wxT("|") ;
s += edata->GetEnumMemberNameByIndex(i) ; s += edata->GetEnumMemberNameByIndex(i) ;
} }
@@ -1974,7 +1975,7 @@ private :
#define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \ #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_NO_BASE_XTI( name , unit ) \
const wxClassInfo* name::ms_classParents[] = { NULL } ; \ const wxClassInfo* name::ms_classParents[] = { NULL } ; \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \
(wxObjectConstructorFn) 0 , \ (wxObjectConstructorFn) 0 , \
name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \
@@ -1985,7 +1986,7 @@ private :
#define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \ #define IMPLEMENT_DYNAMIC_CLASS_NO_WXOBJECT_XTI( name , basename, unit ) \
const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \ const wxClassInfo* name::ms_classParents[] = { &basename::ms_classInfo ,NULL } ; \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \
(wxObjectConstructorFn) 0 , \ (wxObjectConstructorFn) 0 , \
name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \
@@ -2030,7 +2031,7 @@ private :
wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxObject* wxVariantToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \ wxObject* wxVariantOfPtrToObjectConverter##name ( wxxVariant &data ) { return data.wxTEMPLATED_MEMBER_CALL(Get , name*) ; } \
wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \ wxxVariant wxObjectToVariantConverter##name ( wxObject *data ) { return wxxVariant( dynamic_cast<name*> (data) ) ; } \
wxClassInfo name::ms_classInfo(name::ms_classParents , wxT("") , wxT(#name), \ wxClassInfo name::ms_classInfo(name::ms_classParents , wxEmptyString , wxT(#name), \
(int) sizeof(name), \ (int) sizeof(name), \
(wxObjectConstructorFn) 0 , \ (wxObjectConstructorFn) 0 , \
name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \ name::GetPropertiesStatic(),name::GetHandlersStatic(),0 , 0 , \