make wxFileName::{Mk,Rm}dir() const (closes #10868)

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

diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index 75303de92b342b002cfc02ecfc0f1f505820a86e..27d3fbd022d353b50835e416694a8fa8b06a9c39 100644 (file)
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -6,21 +6,17 @@
 // Created:     30.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_CHOICE_H_
 #define _WX_UNIV_CHOICE_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univchoice.h"
-#endif
-
 #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
+class WXDLLIMPEXP_CORE wxChoice : public wxComboBox
 {
 public:
     wxChoice() {}
@@ -45,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);