Need LINKAGEMODE for Visualage C++ compiles on the static global procs at the top

[wxWidgets.git] / src / common / ctrlcmn.cpp

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index b58927733fb11fe732f711884cc244ba980e5fea..dec9f63a0c724a07c892e4263090456c8e0a38c7 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
-    #pragma implementation "choicebase.h"
+    #pragma implementation "controlbase.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -42,13 +42,15 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   long style,
+#if wxUSE_VALIDATORS
                                   const wxValidator& validator,
+#endif
                                   const wxString& name)
 {
     // even if it's possible to create controls without parents in some port,
     // it should surely be discouraged because it doesn't work at all under
     // Windows
-    wxCHECK_MSG( parent, FALSE, _T("all controls must have parents") );
+    wxCHECK_MSG( parent, FALSE, wxT("all controls must have parents") );
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;