show default title if no custom one was specified instead of clearing it (patch 1829254)

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 75a63ecef63ea1de277c374f58e7b5475e21c7d1..5b9d60ff5814e3cb5ccf7ef2b32862e2bef5c1d1 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -69,7 +69,9 @@ wxColourDialogHookProc(HWND hwnd,
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 
         CHOOSECOLOR *pCC = (CHOOSECOLOR *)lParam;
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 

-        ::SetWindowText(hwnd, dialog->GetTitle().wx_str());
+        const wxString& title = dialog->GetTitle();
+        if ( !title.empty() )
+            ::SetWindowText(hwnd, title.wx_str());

 
         wxPoint pos = dialog->GetPosition();
         if ( pos != wxDefaultPosition )
 
         wxPoint pos = dialog->GetPosition();
         if ( pos != wxDefaultPosition )