Committing in .

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

diff --git a/src/common/ctrlcmn.cpp b/src/common/ctrlcmn.cpp
index 99145cb02993234ca2e837c7ba7e7c7167d32064..be7735196dbd9c357e5849d8fdc142ff7154abac 100644 (file)
--- a/src/common/ctrlcmn.cpp
+++ b/src/common/ctrlcmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "ctrlcmn.h"
+    #pragma implementation "controlbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -42,13 +42,19 @@ bool wxControlBase::CreateControl(wxWindowBase *parent,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   long style,
                                   const wxPoint& pos,
                                   const wxSize& size,
                                   long style,

+#if wxUSE_VALIDATORS
+#  if defined(__VISAGECPP__)
+                                  const wxValidator* validator,
+#  else

                                   const wxValidator& validator,
                                   const wxValidator& validator,

+#  endif
+#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
                                   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;
 
     if ( !CreateBase(parent, id, pos, size, style, validator, name) )
         return FALSE;