Fix wrong tab order in wxAuiNotebook after dragging.

[wxWidgets.git] / include / wx / univ / choice.h

diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index f56590f372d583538b591bbc2d2315a9a3b09cb4..b598e8874f19c23cb1a1efdd2c8324d2dada96ef 100644 (file)
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -15,8 +15,8 @@
 #include "wx/combobox.h"
 
 // VS: This is only a *temporary* implementation, real wxChoice should not
-//     derive from wxComboBox and may have different l&f 
-class WXDLLEXPORT wxChoice : public wxComboBox
+//     derive from wxComboBox and may have different l&f
+class WXDLLIMPEXP_CORE wxChoice : public wxComboBox
 {
 public:
     wxChoice() {}
@@ -41,7 +41,7 @@ public:
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString choices[] = (wxString *) NULL,
+                int n = 0, const wxString choices[] = NULL,
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
@@ -52,10 +52,10 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
-    
+
 private:
     void OnComboBox(wxCommandEvent &event);
-    
+
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxChoice)
 };