Changed order of #ifdefs to get native version on OS/2, even if

[wxWidgets.git] / src / generic / propform.cpp

diff --git a/src/generic/propform.cpp b/src/generic/propform.cpp
index d017b0d4b8583543b369f9408b188cb811a279ab..e8f651083cf3ecf330bdbf37b6a5c92c85cc4649 100644 (file)
--- a/src/generic/propform.cpp
+++ b/src/generic/propform.cpp
@@ -150,7 +150,7 @@ bool wxPropertyFormView::AssociateNames(void)
   while (node)
   {
     wxWindow *win = (wxWindow *)node->Data();
   while (node)
   {
     wxWindow *win = (wxWindow *)node->Data();

-    if (win->GetName() != _T(""))
+    if (win->GetName() != wxT(""))

     {
       wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
       if (prop)
     {
       wxProperty *prop = m_propertySheet->GetProperty(win->GetName());
       if (prop)


@@ -207,18 +207,18 @@ void wxPropertyFormView::OnCommand(wxWindow& win, wxCommandEvent& event)
   if (!m_propertySheet)
     return;
     
   if (!m_propertySheet)
     return;
     

-  if (win.GetName() == _T(""))
+  if (win.GetName() == wxT(""))

     return;
 
     return;
 

-  if (wxStrcmp(win.GetName(), _T("ok")) == 0)
+  if (wxStrcmp(win.GetName(), wxT("ok")) == 0)

     OnOk(event);
     OnOk(event);

-  else if (wxStrcmp(win.GetName(), _T("cancel")) == 0)
+  else if (wxStrcmp(win.GetName(), wxT("cancel")) == 0)

     OnCancel(event);
     OnCancel(event);

-  else if (wxStrcmp(win.GetName(), _T("help")) == 0)
+  else if (wxStrcmp(win.GetName(), wxT("help")) == 0)

     OnHelp(event);
     OnHelp(event);

-  else if (wxStrcmp(win.GetName(), _T("update")) == 0)
+  else if (wxStrcmp(win.GetName(), wxT("update")) == 0)

     OnUpdate(event);
     OnUpdate(event);

-  else if (wxStrcmp(win.GetName(), _T("revert")) == 0)
+  else if (wxStrcmp(win.GetName(), wxT("revert")) == 0)

     OnRevert(event);
   else
   {
     OnRevert(event);
   else
   {


@@ -427,16 +427,16 @@ bool wxRealFormValidator::OnCheckValue( wxProperty *property, wxPropertyFormView
   if (!StringToFloat(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];
   if (!StringToFloat(WXSTRINGCAST value, &val))
   {
     wxChar buf[200];

-    wxSprintf(buf, _T("Value %s is not a valid real number!"), (const wxChar *)value);
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value %s is not a valid real number!"), (const wxChar *)value);
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

     return FALSE;
   }
   
   if (val < m_realMin || val > m_realMax)
   {
     wxChar buf[200];
     return FALSE;
   }
   
   if (val < m_realMin || val > m_realMax)
   {
     wxChar buf[200];

-    wxSprintf(buf, _T("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
-    wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+    wxSprintf(buf, wxT("Value must be a real number between %.2f and %.2f!"), m_realMin, m_realMax);
+    wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

     return FALSE;
   }
   return TRUE;
     return FALSE;
   }
   return TRUE;


@@ -498,8 +498,8 @@ bool wxIntegerFormValidator::OnCheckValue(wxProperty *property, wxPropertyFormVi
     if (!StringToLong(WXSTRINGCAST value, &val))
     {
       wxChar buf[200];
     if (!StringToLong(WXSTRINGCAST value, &val))
     {
       wxChar buf[200];

-      wxSprintf(buf, _T("Value %s is not a valid integer!"), (const wxChar *)value);
-      wxMessageBox(buf, _T("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
+      wxSprintf(buf, wxT("Value %s is not a valid integer!"), (const wxChar *)value);
+      wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);

       return FALSE;
     }
   }
       return FALSE;
     }
   }