merging back XTI branch part 2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 08:31:53 +00:00
parent f0c6b96336
commit 2895324520
244 changed files with 4364 additions and 5859 deletions
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -24,8 +24,6 @@

 #include "wx/os2/private.h"

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)
-
 bool wxChoice::Create(
  wxWindow*                         pParent
 , wxWindowID                        vId