Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[wxWidgets.git] / src / univ / choice.cpp

diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index fdd855df673a5ea6b0d9dc563b7ff8a3afcbae71..5bb5b0020b2db5d86d30f87c3e4a68616d91c88b 100644 (file)
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        univ/choice.cpp
+// Name:        src/univ/choice.cpp

 // Purpose:     wxChoice implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Purpose:     wxChoice implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.12.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "univchoice.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -29,15 +25,14 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

     #include "wx/arrstr.h"
 #endif
 
     #include "wx/arrstr.h"
 #endif
 

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-

 BEGIN_EVENT_TABLE(wxChoice, wxComboBox)
 BEGIN_EVENT_TABLE(wxChoice, wxComboBox)

-    EVT_COMBOBOX(-1, wxChoice::OnComboBox)
+    EVT_COMBOBOX(wxID_ANY, wxChoice::OnComboBox)

 END_EVENT_TABLE()
 
 wxChoice::wxChoice(wxWindow *parent, wxWindowID id,
 END_EVENT_TABLE()
 
 wxChoice::wxChoice(wxWindow *parent, wxWindowID id,