.empty() string decorations

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index b7feab4c5bc490b52e47349a177a2a6abfbf6aac..ae626177ced4d4f469f216f15c955e079e4b8acb 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -141,7 +141,7 @@ bool wxChoice::CreateAndInit(wxWindow *parent,
         return false;
 
     // now create the real HWND
         return false;
 
     // now create the real HWND

-    if ( !MSWCreateControl(wxT("COMBOBOX"), _T(""), pos, size) )
+    if ( !MSWCreateControl(wxT("COMBOBOX"), wxEmptyString, pos, size) )

         return false;
 
 
         return false;
 
 


@@ -350,7 +350,7 @@ int wxChoice::FindString(const wxString& s) const
    {
      int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
                                 (WPARAM)-1, (LPARAM)s.c_str());
    {
      int pos = (int)SendMessage(GetHwnd(), CB_FINDSTRINGEXACT,
                                 (WPARAM)-1, (LPARAM)s.c_str());

- 
+

      return pos == LB_ERR ? wxNOT_FOUND : pos;
    }
 #endif // Watcom/!Watcom
      return pos == LB_ERR ? wxNOT_FOUND : pos;
    }
 #endif // Watcom/!Watcom


@@ -507,10 +507,10 @@ void wxChoice::DoSetSize(int x, int y,
     else
     {
         // We cannot pass wxDefaultCoord as height to wxControl. wxControl uses
     else
     {
         // We cannot pass wxDefaultCoord as height to wxControl. wxControl uses

-        // wxGetWindowRect() to determine the current height of the combobox, 
-        // and then again sets the combobox's height to that value. Unfortunately, 
-        // wxGetWindowRect doesn't include the dropdown list's height (at least 
-        // on Win2K), so this would result in a combobox with dropdown height of 
+        // wxGetWindowRect() to determine the current height of the combobox,
+        // and then again sets the combobox's height to that value. Unfortunately,
+        // wxGetWindowRect doesn't include the dropdown list's height (at least
+        // on Win2K), so this would result in a combobox with dropdown height of

         // 1 pixel. We have to determine the default height ourselves and call
         // wxControl with that value instead.
         int w, h;
         // 1 pixel. We have to determine the default height ourselves and call
         // wxControl with that value instead.
         int w, h;


@@ -518,7 +518,7 @@ void wxChoice::DoSetSize(int x, int y,
         DoGetSize(&w, &h);
         if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)
         {
         DoGetSize(&w, &h);
         if (::SendMessage(GetHwnd(), CB_GETDROPPEDCONTROLRECT, 0, (LPARAM) &r) != 0)
         {

-            height = h + r.bottom - r.top;       
+            height = h + r.bottom - r.top;

         }
     }
 
         }
     }
 

diff --git a/src/msw/datectrl.cpp b/src/msw/datectrl.cpp
index 71ba127e719ab3f731262d69bc8c24ad3d30a37f..a25d94071af3fb464437218df423d60c615ac116 100644 (file)
--- a/src/msw/datectrl.cpp
+++ b/src/msw/datectrl.cpp
@@ -136,7 +136,7 @@ wxDatePickerCtrl::Create(wxWindow *parent,
         return false;
 
     // create the native control
         return false;
 
     // create the native control

-    if ( !MSWCreateControl(DATETIMEPICK_CLASS, _T(""), pos, size) )
+    if ( !MSWCreateControl(DATETIMEPICK_CLASS, wxEmptyString, pos, size) )

         return false;
 
     if ( dt.IsValid() )
         return false;
 
     if ( dt.IsValid() )

diff --git a/src/msw/debughlp.cpp b/src/msw/debughlp.cpp
index 98b35f06e0f32da9ed6e9a08379ea8d871600f1a..55a1006cf7db7ae8748b3f1dc974a818596a7fa0 100644 (file)
--- a/src/msw/debughlp.cpp
+++ b/src/msw/debughlp.cpp
@@ -672,7 +672,7 @@ extern "C" void DumpTI(ULONG ti)
     }
 
     OutputDebugString(wxString::Format(_T("tag=%s%s"),
     }
 
     OutputDebugString(wxString::Format(_T("tag=%s%s"),

-                      nested ? _T("nested ") : _T(""),
+                      nested ? _T("nested ") : wxEmptyString,

                       TagString(tag).c_str()));
     if ( tag == wxDbgHelpDLL::SYMBOL_TAG_UDT )
     {
                       TagString(tag).c_str()));
     if ( tag == wxDbgHelpDLL::SYMBOL_TAG_UDT )
     {

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index 90c122a4cce51ee2403b22d9fd156bb9dd422a6b..49c6d04c040586e1c6ad599d984520ad268da589 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -350,7 +350,7 @@ bool wxListCtrl::Create(wxWindow *parent,
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 
     if ( !CreateControl(parent, id, pos, size, style, validator, name) )
         return false;
 

-    if ( !MSWCreateControl(WC_LISTVIEW, _T(""), pos, size) )
+    if ( !MSWCreateControl(WC_LISTVIEW, wxEmptyString, pos, size) )

         return false;
 
     // explicitly say that we want to use Unicode because otherwise we get ANSI
         return false;
 
     // explicitly say that we want to use Unicode because otherwise we get ANSI

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 5198ea044ad0515b198f8222cd7816101c51f3ec..56e9af2adb0e32b1be4501addf556e2d6f74306a 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -94,8 +94,8 @@ static wxString wxGetPrintDlgError()
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
     HGLOBAL hDev = NULL;

-    // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
-    if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+    // if (!driverName.empty() && !printerName.empty() && !portName.empty())
+    if (driverName.empty() && printerName.empty() && portName.empty())

     {
     }
     else
     {
     }
     else


@@ -248,7 +248,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             {
                 case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
                 case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;
             {
                 case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
                 case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;

-                default:    
+                default:

                 case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
             }
         }
                 case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
             }
         }


@@ -299,13 +299,13 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
             // Not sure if we should check for this mismatch
 //            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
 
             // Not sure if we should check for this mismatch
 //            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
 

-            if (printerName != wxT(""))
+            if (!printerName.empty())

                 data.SetPrinterName( printerName );
 
             GlobalUnlock(hDevNames);
         }
     }
                 data.SetPrinterName( printerName );
 
             GlobalUnlock(hDevNames);
         }
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -391,7 +391,7 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
 
         //// Printer name
         wxString name = data.GetPrinterName();
 
         //// Printer name
         wxString name = data.GetPrinterName();

-        if (name != wxT(""))
+        if (!name.empty())

         {
             //int len = wxMin(31, m_printerName.Len());
             wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
         {
             //int len = wxMin(31, m_printerName.Len());
             wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);


@@ -505,11 +505,11 @@ bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.

-    m_devNames = (void*) (long) wxCreateDevNames(wxT(""), data.GetPrinterName(), wxT(""));
-    
+    m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+

     return true;
 }
     return true;
 }

-    
+

 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------


@@ -538,7 +538,7 @@ bool wxWindowsPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 
     // MSW handle
     m_printDlg = NULL;
 
     // MSW handle
     m_printDlg = NULL;

-    
+

     if ( data )
         m_printDialogData = *data;
 
     if ( data )
         m_printDialogData = *data;
 


@@ -562,7 +562,7 @@ int wxWindowsPrintDialog::ShowModal()
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
     ConvertToNative( m_printDialogData );
 
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;

-    
+

     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())


@@ -603,13 +603,13 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
     data.GetPrintData().ConvertToNative();
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
     data.GetPrintData().ConvertToNative();

-    
+

     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
     // Shouldn't have been defined anywhere
     if (pd)
         return false;
     PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
     // Shouldn't have been defined anywhere
     if (pd)
         return false;

-    
+

     pd = new PRINTDLG;
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;
     pd = new PRINTDLG;
     memset( pd, 0, sizeof(PRINTDLG) );
     m_printDlg = (void*) pd;


@@ -626,7 +626,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
 
     pd->Flags          = PD_RETURNDEFAULT;
     pd->nCopies        = 1;
 
     pd->Flags          = PD_RETURNDEFAULT;
     pd->nCopies        = 1;

-    
+

     // Pass the devmode data to the PRINTDLG structure, since it'll
     // be needed when PrintDlg is called.
     if (pd->hDevMode)
     // Pass the devmode data to the PRINTDLG structure, since it'll
     // be needed when PrintDlg is called.
     if (pd->hDevMode)


@@ -695,7 +695,7 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
     if ( data.GetSetupDialog() )
         pd->Flags |= PD_PRINTSETUP;
 #endif
     if ( data.GetSetupDialog() )
         pd->Flags |= PD_PRINTSETUP;
 #endif

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -707,7 +707,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();

-    
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -752,7 +752,7 @@ bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
 #if WXWIN_COMPATIBILITY_2_4
     data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );
     data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
 #if WXWIN_COMPATIBILITY_2_4
     data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );

-#endif    
+#endif

     return true;
 }
 
     return true;
 }
 


@@ -798,7 +798,7 @@ wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog()
 int wxWindowsPageSetupDialog::ShowModal()
 {
     ConvertToNative( m_pageSetupData );
 int wxWindowsPageSetupDialog::ShowModal()
 {
     ConvertToNative( m_pageSetupData );

-    
+

     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
         pd->hwndOwner = (HWND) m_dialogParent->GetHWND();


@@ -828,7 +828,7 @@ bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
     // Shouldn't have been defined anywhere
     if (pd)
         return false;
     // Shouldn't have been defined anywhere
     if (pd)
         return false;

-        
+

     pd = new PAGESETUPDLG;
     pd->hDevMode = NULL;
     pd->hDevNames = NULL;
     pd = new PAGESETUPDLG;
     pd->hDevMode = NULL;
     pd->hDevNames = NULL;


@@ -929,7 +929,7 @@ bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
 
     wxWindowsPrintNativeData *native_data =
         (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();

-        
+

     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {


@@ -941,7 +941,7 @@ bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
         native_data->SetDevMode( (void*) pd->hDevMode );
         pd->hDevMode = NULL;
     }
         native_data->SetDevMode( (void*) pd->hDevMode );
         pd->hDevMode = NULL;
     }

-    
+

     // Isn't this superfluous? It's called again below.
     // data.GetPrintData().ConvertFromNative();
 
     // Isn't this superfluous? It's called again below.
     // data.GetPrintData().ConvertFromNative();
 


@@ -977,7 +977,7 @@ bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
 
     data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
     data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );
 
     data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
     data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );

-    
+

     return true;
 }
 
     return true;
 }
 

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index f67b384083d16ab3c03a5cf5f99c1467b8939b52..5a12a002b79ed8ab458c3f0544f7f55111730684 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -128,7 +128,7 @@ wxStackFrame::GetParam(size_t n,
 
 void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 {
 
 void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 {

-    m_paramTypes.Add(_T(""));
+    m_paramTypes.Add(wxEmptyString);

 
     m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
 
 
     m_paramNames.Add(wxString::FromAscii(pSymInfo->Name));
 


@@ -154,7 +154,7 @@ void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
     __except ( EXCEPTION_EXECUTE_HANDLER )
 #endif
     {
     __except ( EXCEPTION_EXECUTE_HANDLER )
 #endif
     {

-        m_paramValues.Add(_T(""));
+        m_paramValues.Add(wxEmptyString);

     }
 }
 
     }
 }
 

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index 81ea3e299fb43d874477cbf11148a8fb52cfc2b6..686f25018d06ef00ecedc1c83481338054d02f05 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -145,7 +145,7 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TTN_NEEDTEXT:
         {
             // TODO
         case TTN_NEEDTEXT:
         {
             // TODO

-//            if (tool->m_shortHelpString != "")
+//            if (!tool->m_shortHelpString.empty())

 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }
 #endif
 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }
 #endif

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index bf8cc72ded5799742f3fc745df4c32273055eef1..53d205ed73934ad9ac643d985baeb76ffd711728 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -926,7 +926,7 @@ bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {

-    wxCHECK_MSG( item.IsOk(), wxT(""), wxT("invalid tree item") );
+    wxCHECK_MSG( item.IsOk(), wxEmptyString, wxT("invalid tree item") );

 
     wxChar buf[512];  // the size is arbitrary...
 
 
     wxChar buf[512];  // the size is arbitrary...