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 95d9d695c3092322683a5ac785f2b9b7e30fe2e2..36e052101da0147f6f1bf0cdd2cd4ad85c1c3787 100644 (file)
--- 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 f84aed2a4780e4b8c234afc5594ca3f3d27b7314..4b8beeafd75745f2130b8d612004f0f666d415db 100644 (file)
--- a/src/common/checklstcmn.cpp
+++ b/src/common/checklstcmn.cpp
@@ -24,7 +24,7 @@
     #pragma hdrstop\r
 #endif\r
 \r
-#if wxUSE_CHECKLISTBOX && wxUSE_OWNER_DRAWN\r
+#if wxUSE_CHECKLISTBOX\r
 \r
 #include "wx/checklst.h"\r
 \r

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 43ca4f09e327c0076672bbe9ab144918e75e8f6a..a75aebf608ef942e4e12dea3f0be8ebe25e4ac62 100644 (file)
--- 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 cb46643608f8ed70f7f55c9c20118caeeb61e433..bb84a1816d2b04fc229c170976e74af2aa1a0529 100644 (file)
--- 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 ff83d6d2c5f9b2667a6a8b39919d3901761828b7..b461e6ab3a45abc7293741a585c269950059583f 100644 (file)
--- 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 cfa3fa73bd79801b14faf2b2539f7e7fa58c2418..b999b94f2daa05321e1d293e6649b19112ee2b8a 100644 (file)
--- 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 75b50ac813fbdf7f74974476c948f4524a65feb9..9cfd3541d6f9fb49df024e8e6be2ebf416ac193f 100644 (file)
--- 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 d6c4eb08c7f6da93eb105f32583bcfc482901a66..6773983e9ff35bff453c7e92f7c0ba98d2b39b05 100644 (file)
--- 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 fd1d66d478070216d797db2cbc01725779d8bca7..16e0993bc4ea5d0fe434df61b60c17828a996694 100644 (file)
--- 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 a7757f3630afdfa44d4f9b3db663333493c5243b..b730ff0436dcc2a6e896530c340c6a64ff56e7f1 100644 (file)
--- 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 134e30b9b3fe260ee1bb41dc56ed7a0d03e931de..4e2d6f857cc3b282916f04ad6ad48f856dba5711 100644 (file)
--- a/src/univ/checklst.cpp
+++ b/src/univ/checklst.cpp
@@ -57,8 +57,6 @@ public:
 // implementation of wxCheckListBox
 // ============================================================================
 
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBox, wxListBox)
-
 // ----------------------------------------------------------------------------
 // creation
 // ----------------------------------------------------------------------------