Output the extracted number from wxString::ToXXX() even if it returns false.

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index a06a7af8726d6d83c962a55cbf10fe9756cc90d3..015b6946f4b121834f42e40cf918dd583240fd16 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -166,7 +166,7 @@ bool wxListBox::Create(wxWindow *parent,
         return false;
 
     // create the native control
         return false;
 
     // create the native control

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

     {
         // control creation failed
         return false;
     {
         // control creation failed
         return false;


@@ -216,7 +216,7 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
     msStyle |= LBS_NOINTEGRALHEIGHT;
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),
     msStyle |= LBS_NOINTEGRALHEIGHT;
 
     wxASSERT_MSG( !(style & wxLB_MULTIPLE) || !(style & wxLB_EXTENDED),

-                  _T("only one of listbox selection modes can be specified") );
+                  wxT("only one of listbox selection modes can be specified") );

 
     if ( style & wxLB_MULTIPLE )
         msStyle |= LBS_MULTIPLESEL;
 
     if ( style & wxLB_MULTIPLE )
         msStyle |= LBS_MULTIPLESEL;


@@ -224,7 +224,7 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
         msStyle |= LBS_EXTENDEDSEL;
 
     wxASSERT_MSG( !(style & wxLB_ALWAYS_SB) || !(style & wxLB_NO_SB),
         msStyle |= LBS_EXTENDEDSEL;
 
     wxASSERT_MSG( !(style & wxLB_ALWAYS_SB) || !(style & wxLB_NO_SB),

-                  _T( "Conflicting styles wxLB_ALWAYS_SB and wxLB_NO_SB." ) );
+                  wxT( "Conflicting styles wxLB_ALWAYS_SB and wxLB_NO_SB." ) );

 
     if ( !(style & wxLB_NO_SB) )
     {
 
     if ( !(style & wxLB_NO_SB) )
     {


@@ -254,7 +254,7 @@ WXDWORD wxListBox::MSWGetStyle(long style, WXDWORD *exstyle) const
 void wxListBox::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 void wxListBox::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();

-    
+

     if (m_updateHorizontalExtent)
     {
         SetHorizontalExtent(wxEmptyString);
     if (m_updateHorizontalExtent)
     {
         SetHorizontalExtent(wxEmptyString);


@@ -362,7 +362,9 @@ void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
                  wxT("invalid index in wxListBox::SetClientData") );
 
     if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )
                  wxT("invalid index in wxListBox::SetClientData") );
 
     if ( ListBox_SetItemData(GetHwnd(), n, clientData) == LB_ERR )

+    {

         wxLogDebug(wxT("LB_SETITEMDATA failed"));
         wxLogDebug(wxT("LB_SETITEMDATA failed"));

+    }

 }
 
 // Return number of selections and an array of selected integers
 }
 
 // Return number of selections and an array of selected integers


@@ -375,7 +377,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
         int countSel = ListBox_GetSelCount(GetHwnd());
         if ( countSel == LB_ERR )
         {
         int countSel = ListBox_GetSelCount(GetHwnd());
         if ( countSel == LB_ERR )
         {

-            wxLogDebug(_T("ListBox_GetSelCount failed"));
+            wxLogDebug(wxT("ListBox_GetSelCount failed"));

         }
         else if ( countSel != 0 )
         {
         }
         else if ( countSel != 0 )
         {