String changes for translations,

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

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index 613edc426aa7e9f4bc3fad028ab6c46bbbed9f28..c15c16e0d17de9083a4029dca2908451bccb257f 100644 (file)
--- a/src/msw/checklst.cpp
+++ b/src/msw/checklst.cpp
@@ -45,7 +45,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
 #include <windows.h>
 #include <windowsx.h>
 

-#ifdef __GNUWIN32__
+#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)

 #include "wx/msw/gnuwin32/extra.h"
 #endif
 
 #include "wx/msw/gnuwin32/extra.h"
 #endif
 


@@ -146,7 +146,11 @@ bool wxCheckListBoxItem::OnDrawItem(wxDC& dc, const wxRect& rc,
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it
       HBITMAP hbmpOld = (HBITMAP)SelectObject(hdcMem, hbmpCheck);
 
       // then draw a check mark into it

-      RECT rect = { 0, 0, nCheckWidth, nCheckHeight };
+      RECT rect ;
+      rect.left   = 0 ;
+      rect.top    = 0 ;
+      rect.right  = nCheckWidth ;
+      rect.bottom = nCheckHeight ;

 
 #ifdef __WIN32__
 #ifndef __SC__
 
 #ifdef __WIN32__
 #ifndef __SC__


@@ -221,7 +225,7 @@ void wxCheckListBoxItem::Check(bool check)
         // update it
         int index = m_pParent->GetItemIndex(this);
 
         // update it
         int index = m_pParent->GetItemIndex(this);
 

-        wxASSERT_MSG( index != wxNOT_FOUND, "what does this item do here?" );
+        wxASSERT_MSG( index != wxNOT_FOUND, wxT("what does this item do here?") );

 
         m_nIndex = (size_t)index;
     }
 
         m_nIndex = (size_t)index;
     }


@@ -234,13 +238,17 @@ void wxCheckListBoxItem::Check(bool check)
         if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
                            m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
         {
         if ( ::SendMessage(hwndListbox, LB_GETITEMRECT,
                            m_nIndex, (LPARAM)&rcUpdate) == LB_ERR )
         {

-            wxLogDebug("LB_GETITEMRECT failed");
+            wxLogDebug(wxT("LB_GETITEMRECT failed"));

         }
     #else // Win16
         // FIXME this doesn't work if the listbox is scrolled!
         size_t nHeight = m_pParent->GetItemHeight();
         size_t y = m_nIndex * nHeight;
         }
     #else // Win16
         // FIXME this doesn't work if the listbox is scrolled!
         size_t nHeight = m_pParent->GetItemHeight();
         size_t y = m_nIndex * nHeight;

-        RECT rcUpdate = { 0, y, GetDefaultMarginWidth(), y + nHeight};
+        RECT rcUpdate ;
+        rcUpdate.left   = 0 ;
+        rcUpdate.top    = y ;
+        rcUpdate.right  = GetDefaultMarginWidth() ;
+        rcUpdate.bottom = y + nHeight ;

     #endif  // Win32/16
 
     InvalidateRect(hwndListbox, &rcUpdate, FALSE);
     #endif  // Win32/16
 
     InvalidateRect(hwndListbox, &rcUpdate, FALSE);


@@ -285,7 +293,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxCheckListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

-                 "invalid index in wxListBox::Delete" );
+                 wxT("invalid index in wxListBox::Delete") );

 
     wxListBox::Delete(N);
 
 
     wxListBox::Delete(N);
 


@@ -298,7 +306,7 @@ void wxCheckListBox::Delete(int N)
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
 void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,

-                 "invalid index in wxCheckListBox::InsertItems" );
+                 wxT("invalid index in wxCheckListBox::InsertItems") );

 
     wxListBox::InsertItems(nItems, items, pos);
 
 
     wxListBox::InsertItems(nItems, items, pos);
 


@@ -306,7 +314,10 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
     for ( i = 0; i < nItems; i++ ) {
         wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i));
         pNewItem->SetName(items[i]);
     for ( i = 0; i < nItems; i++ ) {
         wxOwnerDrawn *pNewItem = CreateItem((size_t)(pos + i));
         pNewItem->SetName(items[i]);

+        pNewItem->SetFont(GetFont());
+

         m_aItems.Insert(pNewItem, (size_t)(pos + i));
         m_aItems.Insert(pNewItem, (size_t)(pos + i));

+

         ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem);
     }
 }
         ListBox_SetItemData((HWND)GetHWND(), i + pos, pNewItem);
     }
 }


@@ -315,9 +326,11 @@ void wxCheckListBox::InsertItems(int nItems, const wxString items[], int pos)
 bool wxCheckListBox::SetFont( const wxFont &font )
 {
     size_t i;
 bool wxCheckListBox::SetFont( const wxFont &font )
 {
     size_t i;

-    for (i=0; i < m_aItems.GetCount(); i++)
+    for ( i = 0; i < m_aItems.GetCount(); i++ )

         m_aItems[i]->SetFont(font);
         m_aItems[i]->SetFont(font);

+

     wxListBox::SetFont(font);
     wxListBox::SetFont(font);

+

     return TRUE;
 }
 
     return TRUE;
 }