fixed compilation errors, made messages more human-oriented

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

diff --git a/src/univ/choice.cpp b/src/univ/choice.cpp
index 7af8af88e41d7f16cbedf8fedcaa2341aa8eb0e4..81925542a1e7359efdb7f11dea25fb7f7a441ba3 100644 (file)
--- a/src/univ/choice.cpp
+++ b/src/univ/choice.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "univchoice.h"
 #endif
 
@@ -43,7 +43,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
                       const wxPoint& pos,
                       const wxSize& size,
                       int n, const wxString choices[],
-                      long style,
+                      long WXUNUSED(style),
                       const wxValidator& validator,
                       const wxString& name)
 {