Applied patch [ 827399 ] sqltypes.h included without windows.h under Borland

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

diff --git a/include/wx/univ/choice.h b/include/wx/univ/choice.h
index 134192b4a3af468cd6e17c85e1e8e610a8beb611..3fff15eb4fe37c82af76e3f8eee7e0e5055778b3 100644 (file)
--- a/include/wx/univ/choice.h
+++ b/include/wx/univ/choice.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_CHOICE_H_
 #define _WX_UNIV_CHOICE_H_
 
 #ifndef _WX_UNIV_CHOICE_H_
 #define _WX_UNIV_CHOICE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univchoice.h"
 #endif
 
     #pragma interface "univchoice.h"
 #endif
 


@@ -23,17 +23,14 @@
 class WXDLLEXPORT wxChoice : public wxComboBox
 {
 public:
 class WXDLLEXPORT wxChoice : public wxComboBox
 {
 public:

-    wxChoice() {}
+    wxChoice();

     wxChoice(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
     wxChoice(wxWindow *parent, wxWindowID id,
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             int n = 0, const wxString choices[] = (const wxString *) NULL,
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,

-            const wxString& name = wxChoiceNameStr)
-    {
-        Create(parent, id, pos, size, n, choices, style, validator, name);
-    }
+            const wxString& name = wxChoiceNameStr);

 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
 
     bool Create(wxWindow *parent, wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,