From: Stefan Csomor Date: Tue, 4 Jan 2011 09:13:49 +0000 (+0000) Subject: fixing duplicate rti info X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e7478376f1274fb462443ad911647e65e76f3bd8 fixing duplicate rti info git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/cocoa/checklst.mm b/src/cocoa/checklst.mm index 95d9d695c3..36e052101d 100644 --- a/src/cocoa/checklst.mm +++ b/src/cocoa/checklst.mm @@ -20,7 +20,6 @@ #include "wx/app.h" #endif //WX_PRECOMP -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) BEGIN_EVENT_TABLE(wxCheckListBox, wxCheckListBoxBase) END_EVENT_TABLE() // WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView) diff --git a/src/common/checklstcmn.cpp b/src/common/checklstcmn.cpp index f84aed2a47..4b8beeafd7 100644 --- a/src/common/checklstcmn.cpp +++ b/src/common/checklstcmn.cpp @@ -24,7 +24,7 @@ #pragma hdrstop #endif -#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN +#if wxUSE_CHECKLISTBOX #include "wx/checklst.h" diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 43ca4f09e3..a75aebf608 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -46,8 +46,6 @@ static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer), // wxCheckListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox) - wxCheckListBox::wxCheckListBox() : wxListBox() { m_hasCheckBoxes = true; diff --git a/src/gtk1/checklst.cpp b/src/gtk1/checklst.cpp index cb46643608..bb84a1816d 100644 --- a/src/gtk1/checklst.cpp +++ b/src/gtk1/checklst.cpp @@ -22,8 +22,6 @@ // wxCheckListBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox,wxListBox) - wxCheckListBox::wxCheckListBox() : wxListBox() { m_hasCheckBoxes = true; diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp index ff83d6d2c5..b461e6ab3a 100644 --- a/src/motif/checklst.cpp +++ b/src/motif/checklst.cpp @@ -28,8 +28,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) - // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class // ---------------------------------------------------------------------------- diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index cfa3fa73bd..b999b94f2d 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -70,65 +70,6 @@ namespace // implementation // ============================================================================ - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxCheckListBoxStyle ) - -wxBEGIN_FLAGS( wxCheckListBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxLB_SINGLE) - wxFLAGS_MEMBER(wxLB_MULTIPLE) - wxFLAGS_MEMBER(wxLB_EXTENDED) - wxFLAGS_MEMBER(wxLB_HSCROLL) - wxFLAGS_MEMBER(wxLB_ALWAYS_SB) - wxFLAGS_MEMBER(wxLB_NEEDED_SB) - wxFLAGS_MEMBER(wxLB_SORT) - wxFLAGS_MEMBER(wxLB_OWNERDRAW) - -wxEND_FLAGS( wxCheckListBoxStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h") - -wxBEGIN_PROPERTIES_TABLE(wxCheckListBox) - wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent ) - wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxCheckListBox) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) - -#else -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif - // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class // ---------------------------------------------------------------------------- diff --git a/src/msw/wince/checklst.cpp b/src/msw/wince/checklst.cpp index 75b50ac813..9cfd3541d6 100644 --- a/src/msw/wince/checklst.cpp +++ b/src/msw/wince/checklst.cpp @@ -36,8 +36,6 @@ // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxControl) - // ---------------------------------------------------------------------------- // implementation of wxCheckListBox class // ---------------------------------------------------------------------------- diff --git a/src/os2/checklst.cpp b/src/os2/checklst.cpp index d6c4eb08c7..6773983e9f 100644 --- a/src/os2/checklst.cpp +++ b/src/os2/checklst.cpp @@ -56,8 +56,6 @@ static const int CHECK_MARK_WIDTH = 15; // implementation // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) - // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class // ---------------------------------------------------------------------------- diff --git a/src/osx/checklst_osx.cpp b/src/osx/checklst_osx.cpp index fd1d66d478..16e0993bc4 100644 --- a/src/osx/checklst_osx.cpp +++ b/src/osx/checklst_osx.cpp @@ -24,8 +24,6 @@ #include "wx/osx/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) - BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox) END_EVENT_TABLE() diff --git a/src/palmos/checklst.cpp b/src/palmos/checklst.cpp index a7757f3630..b730ff0436 100644 --- a/src/palmos/checklst.cpp +++ b/src/palmos/checklst.cpp @@ -59,65 +59,6 @@ // implementation // ============================================================================ - -#if wxUSE_EXTENDED_RTTI -WX_DEFINE_FLAGS( wxCheckListBoxStyle ) - -wxBEGIN_FLAGS( wxCheckListBoxStyle ) - // new style border flags, we put them first to - // use them for streaming out - wxFLAGS_MEMBER(wxBORDER_SIMPLE) - wxFLAGS_MEMBER(wxBORDER_SUNKEN) - wxFLAGS_MEMBER(wxBORDER_DOUBLE) - wxFLAGS_MEMBER(wxBORDER_RAISED) - wxFLAGS_MEMBER(wxBORDER_STATIC) - wxFLAGS_MEMBER(wxBORDER_NONE) - - // old style border flags - wxFLAGS_MEMBER(wxSIMPLE_BORDER) - wxFLAGS_MEMBER(wxSUNKEN_BORDER) - wxFLAGS_MEMBER(wxDOUBLE_BORDER) - wxFLAGS_MEMBER(wxRAISED_BORDER) - wxFLAGS_MEMBER(wxSTATIC_BORDER) - wxFLAGS_MEMBER(wxBORDER) - - // standard window styles - wxFLAGS_MEMBER(wxTAB_TRAVERSAL) - wxFLAGS_MEMBER(wxCLIP_CHILDREN) - wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW) - wxFLAGS_MEMBER(wxWANTS_CHARS) - wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE) - wxFLAGS_MEMBER(wxALWAYS_SHOW_SB ) - wxFLAGS_MEMBER(wxVSCROLL) - wxFLAGS_MEMBER(wxHSCROLL) - - wxFLAGS_MEMBER(wxLB_SINGLE) - wxFLAGS_MEMBER(wxLB_MULTIPLE) - wxFLAGS_MEMBER(wxLB_EXTENDED) - wxFLAGS_MEMBER(wxLB_HSCROLL) - wxFLAGS_MEMBER(wxLB_ALWAYS_SB) - wxFLAGS_MEMBER(wxLB_NEEDED_SB) - wxFLAGS_MEMBER(wxLB_SORT) - wxFLAGS_MEMBER(wxLB_OWNERDRAW) - -wxEND_FLAGS( wxCheckListBoxStyle ) - -IMPLEMENT_DYNAMIC_CLASS_XTI(wxCheckListBox, wxListBox,"wx/checklst.h") - -wxBEGIN_PROPERTIES_TABLE(wxCheckListBox) - wxEVENT_PROPERTY( Toggle , wxEVT_COMMAND_CHECKLISTBOX_TOGGLED , wxCommandEvent ) - wxPROPERTY_FLAGS( WindowStyle , wxCheckListBoxStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , wxLB_OWNERDRAW /*flags*/ , wxT("Helpstring") , wxT("group")) // style -wxEND_PROPERTIES_TABLE() - -wxBEGIN_HANDLERS_TABLE(wxCheckListBox) -wxEND_HANDLERS_TABLE() - -wxCONSTRUCTOR_4( wxCheckListBox , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size ) - -#else -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) -#endif - // ---------------------------------------------------------------------------- // declaration and implementation of wxCheckListBoxItem class // ---------------------------------------------------------------------------- diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp index 134e30b9b3..4e2d6f857c 100644 --- a/src/univ/checklst.cpp +++ b/src/univ/checklst.cpp @@ -57,8 +57,6 @@ public: // implementation of wxCheckListBox // ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox) - // ---------------------------------------------------------------------------- // creation // ----------------------------------------------------------------------------