Applied Diana's font patch II

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

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 8182a7ced8e1fcb6185a31216d5da142f7749adb..5374d816a7c72f05e96773ac201b06f061343df3 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -20,35 +20,67 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/window.h"
+#include "wx/msw/private.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/listbox.h"
-    #include "wx/settings.h"
-    #include "wx/brush.h"
-    #include "wx/font.h"
-    #include "wx/dc.h"
+#include "wx/listbox.h"
+#include "wx/settings.h"
+#include "wx/brush.h"
+#include "wx/font.h"
+#include "wx/dc.h"
+#include "wx/utils.h"

 #endif
 
 #endif
 

-#include "wx/msw/private.h"
-
-#include <windows.h>

 #include <windowsx.h>
 
 #include <windowsx.h>
 

-#ifndef __TWIN32__
-    #ifdef __GNUWIN32__
-        #include <wx/msw/gnuwin32/extra.h>
-    #endif
+#ifdef __WXWINE__
+  #if defined(GetWindowStyle)
+    #undef GetWindowStyle
+  #endif

 #endif
 
 #endif
 

-#ifdef GetCharWidth
-    #undef GetCharWidth
-#endif
+#include "wx/dynarray.h"
+#include "wx/log.h"

 
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 
 
 #if wxUSE_OWNER_DRAWN
     #include  "wx/ownerdrw.h"
 #endif
 

-#include "wx/dynarray.h"
-#include "wx/log.h"
+#ifndef __TWIN32__
+    #if defined(__GNUWIN32__)
+        #ifndef wxUSE_NORLANDER_HEADERS
+            #include <wx/msw/gnuwin32/extra.h>
+        #endif
+    #endif
+#endif
+
+#ifdef __WXWINE__
+  #ifndef ListBox_SetItemData
+    #define ListBox_SetItemData(hwndCtl, index, data) \
+      ((int)(DWORD)SendMessage((hwndCtl), LB_SETITEMDATA, (WPARAM)(int)(index), (LPARAM)(data)))
+  #endif
+  #ifndef ListBox_GetHorizontalExtent
+    #define ListBox_GetHorizontalExtent(hwndCtl) \
+      ((int)(DWORD)SendMessage((hwndCtl), LB_GETHORIZONTALEXTENT, 0L, 0L))
+  #endif
+  #ifndef ListBox_GetSelCount
+    #define ListBox_GetSelCount(hwndCtl) \
+      ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELCOUNT, 0L, 0L))
+  #endif
+  #ifndef ListBox_GetSelItems
+    #define ListBox_GetSelItems(hwndCtl, cItems, lpItems) \
+      ((int)(DWORD)SendMessage((hwndCtl), LB_GETSELITEMS, (WPARAM)(int)(cItems), (LPARAM)(int *)(lpItems)))
+  #endif
+  #ifndef ListBox_GetTextLen
+    #define ListBox_GetTextLen(hwndCtl, index) \
+      ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXTLEN, (WPARAM)(int)(index), 0L))
+  #endif
+  #ifndef ListBox_GetText
+    #define ListBox_GetText(hwndCtl, index, lpszBuffer) \
+      ((int)(DWORD)SendMessage((hwndCtl), LB_GETTEXT, (WPARAM)(int)(index), (LPARAM)(LPCTSTR)(lpszBuffer)))
+  #endif
+#endif

 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)


@@ -83,9 +115,6 @@ wxOwnerDrawn *wxListBox::CreateItem(size_t n)
 // list box control implementation
 // ============================================================================
 
 // list box control implementation
 // ============================================================================
 

-// this macro is dangerous but still better than tons of (HWND)GetHWND()
-#define   hwnd    (HWND)GetHWND()
-

 bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     /*
 bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
 {
     /*


@@ -104,19 +133,19 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             event.m_commandInt = aSelections[0] ;
             event.m_clientData = GetClientData(event.m_commandInt);
             wxString str(GetString(event.m_commandInt));
             event.m_commandInt = aSelections[0] ;
             event.m_clientData = GetClientData(event.m_commandInt);
             wxString str(GetString(event.m_commandInt));

-            if (str != "")
-                event.m_commandString = copystring((char *)(const char *)str);
+            if (str != wxT(""))
+            {
+               event.m_commandString = str;
+            }

         }
         else
         {
             event.m_commandInt = -1 ;
         }
         else
         {
             event.m_commandInt = -1 ;

-            event.m_commandString = copystring("") ;
+            event.m_commandString.Empty();

         }
 
         event.SetEventObject( this );
         ProcessCommand(event);
         }
 
         event.SetEventObject( this );
         ProcessCommand(event);

-        if (event.m_commandString)
-            delete[] event.m_commandString ;

         return TRUE;
     }
     else if (param == LBN_DBLCLK)
         return TRUE;
     }
     else if (param == LBN_DBLCLK)


@@ -168,7 +197,8 @@ bool wxListBox::Create(wxWindow *parent,
     int height = size.y;
     m_windowStyle = style;
 
     int height = size.y;
     m_windowStyle = style;
 

-    DWORD wstyle = WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY | LBS_HASSTRINGS;
+    DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
+                   LBS_NOTIFY | LBS_HASSTRINGS;

     if (m_windowStyle & wxLB_MULTIPLE)
         wstyle |= LBS_MULTIPLESEL;
     else if (m_windowStyle & wxLB_EXTENDED)
     if (m_windowStyle & wxLB_MULTIPLE)
         wstyle |= LBS_MULTIPLESEL;
     else if (m_windowStyle & wxLB_EXTENDED)


@@ -202,18 +232,18 @@ bool wxListBox::Create(wxWindow *parent,
         wstyle |= WS_BORDER;
     }
 
         wstyle |= WS_BORDER;
     }
 

-    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "LISTBOX", NULL,
+    m_hWnd = (WXHWND)::CreateWindowEx(exStyle, wxT("LISTBOX"), NULL,

             wstyle | WS_CHILD,
             0, 0, 0, 0,
             (HWND)parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL);
 
             wstyle | WS_CHILD,
             0, 0, 0, 0,
             (HWND)parent->GetHWND(), (HMENU)m_windowId,
             wxGetInstance(), NULL);
 

-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" );
+    wxCHECK_MSG( m_hWnd, FALSE, wxT("Failed to create listbox") );

 
 #if wxUSE_CTL3D
     if (want3D)
     {
 
 #if wxUSE_CTL3D
     if (want3D)
     {

-        Ctl3dSubclassCtl(hwnd);
+        Ctl3dSubclassCtl(GetHwnd());

         m_useCtl3D = TRUE;
     }
 #endif
         m_useCtl3D = TRUE;
     }
 #endif


@@ -227,7 +257,7 @@ bool wxListBox::Create(wxWindow *parent,
     }
 
     if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )
     }
 
     if ( (m_windowStyle & wxLB_MULTIPLE) == 0 )

-        SendMessage(hwnd, LB_SETCURSEL, 0, 0);
+        SendMessage(GetHwnd(), LB_SETCURSEL, 0, 0);

 
     SetFont(parent->GetFont());
 
 
     SetFont(parent->GetFont());
 


@@ -257,9 +287,9 @@ void wxListBox::SetupColours()
 void wxListBox::SetFirstItem(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxListBox::SetFirstItem(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 
 

-    SendMessage(hwnd,LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;
+    SendMessage(GetHwnd(),LB_SETTOPINDEX,(WPARAM)N,(LPARAM)0) ;

 }
 
 void wxListBox::SetFirstItem(const wxString& s)
 }
 
 void wxListBox::SetFirstItem(const wxString& s)


@@ -273,9 +303,9 @@ void wxListBox::SetFirstItem(const wxString& s)
 void wxListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 void wxListBox::Delete(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 
 

-    SendMessage(hwnd, LB_DELETESTRING, N, 0);
+    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);

     m_noItems--;
 
     SetHorizontalExtent("");
     m_noItems--;
 
     SetHorizontalExtent("");


@@ -283,7 +313,7 @@ void wxListBox::Delete(int N)
 
 void wxListBox::Append(const wxString& item)
 {
 
 void wxListBox::Append(const wxString& item)
 {

-    int index = ListBox_AddString(hwnd, item);
+    int index = ListBox_AddString(GetHwnd(), item);

     m_noItems ++;
 
 #if wxUSE_OWNER_DRAWN
     m_noItems ++;
 
 #if wxUSE_OWNER_DRAWN


@@ -291,42 +321,42 @@ void wxListBox::Append(const wxString& item)
         wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument
         pNewItem->SetName(item);
         m_aItems.Add(pNewItem);
         wxOwnerDrawn *pNewItem = CreateItem(index); // dummy argument
         pNewItem->SetName(item);
         m_aItems.Add(pNewItem);

-        ListBox_SetItemData(hwnd, index, pNewItem);
+        ListBox_SetItemData(GetHwnd(), index, pNewItem);

     }
 #endif
 
     SetHorizontalExtent(item);
 }
 
     }
 #endif
 
     SetHorizontalExtent(item);
 }
 

-void wxListBox::Append(const wxString& item, char *Client_data)
+void wxListBox::Append(const wxString& item, void *Client_data)

 {
 {

-    int index = ListBox_AddString(hwnd, item);
+    int index = ListBox_AddString(GetHwnd(), item);

     m_noItems ++;
 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // client data must be pointer to wxOwnerDrawn, otherwise we would crash
         // in OnMeasure/OnDraw.
     m_noItems ++;
 
 #if wxUSE_OWNER_DRAWN
     if ( m_windowStyle & wxLB_OWNERDRAW ) {
         // client data must be pointer to wxOwnerDrawn, otherwise we would crash
         // in OnMeasure/OnDraw.

-        wxFAIL_MSG("Can't use client data with owner-drawn listboxes");
+        wxFAIL_MSG(wxT("Can't use client data with owner-drawn listboxes"));

     }
     else
 #endif
 
     }
     else
 #endif
 

-    ListBox_SetItemData(hwnd, index, Client_data);
+    ListBox_SetItemData(GetHwnd(), index, Client_data);

 
     SetHorizontalExtent(item);
 }
 
 
     SetHorizontalExtent(item);
 }
 

-void wxListBox::Set(int n, const wxString *choices, char** clientData)
+void wxListBox::Set(int n, const wxString *choices, void** clientData)

 {
 {

-    ShowWindow(hwnd, SW_HIDE);
-    ListBox_ResetContent(hwnd);
+    ShowWindow(GetHwnd(), SW_HIDE);
+    ListBox_ResetContent(GetHwnd());

     int i;
     for (i = 0; i < n; i++)
     {
     int i;
     for (i = 0; i < n; i++)
     {

-        ListBox_AddString(hwnd, choices[i]);
+        ListBox_AddString(GetHwnd(), choices[i]);

         if ( clientData )
         if ( clientData )

-            ListBox_SetItemData(hwnd, i, clientData[i]);
+            ListBox_SetItemData(GetHwnd(), i, clientData[i]);

     }
     m_noItems = n;
 
     }
     m_noItems = n;
 


@@ -344,21 +374,21 @@ void wxListBox::Set(int n, const wxString *choices, char** clientData)
             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);
             wxOwnerDrawn *pNewItem = CreateItem(ui);
             pNewItem->SetName(choices[ui]);
             m_aItems.Add(pNewItem);

-            ListBox_SetItemData(hwnd, ui, pNewItem);
+            ListBox_SetItemData(GetHwnd(), ui, pNewItem);

 
             wxASSERT_MSG(clientData[ui] == NULL,
 
             wxASSERT_MSG(clientData[ui] == NULL,

-                    "Can't use client data with owner-drawn listboxes");
+                    wxT("Can't use client data with owner-drawn listboxes"));

         }
     }
 #endif
 
     SetHorizontalExtent("");
         }
     }
 #endif
 
     SetHorizontalExtent("");

-    ShowWindow(hwnd, SW_SHOW);
+    ShowWindow(GetHwnd(), SW_SHOW);

 }
 
 int wxListBox::FindString(const wxString& s) const
 {
 }
 
 int wxListBox::FindString(const wxString& s) const
 {

-    int pos = ListBox_FindStringExact(hwnd, (WPARAM)-1, s);
+    int pos = ListBox_FindStringExact(GetHwnd(), (WPARAM)-1, s);

     if (pos == LB_ERR)
         return -1;
     else
     if (pos == LB_ERR)
         return -1;
     else


@@ -367,7 +397,7 @@ int wxListBox::FindString(const wxString& s) const
 
 void wxListBox::Clear()
 {
 
 void wxListBox::Clear()
 {

-    ListBox_ResetContent(hwnd);
+    ListBox_ResetContent(GetHwnd());

 
 #if wxUSE_OWNER_DRAWN
     size_t uiCount = m_aItems.Count();
 
 #if wxUSE_OWNER_DRAWN
     size_t uiCount = m_aItems.Count();


@@ -379,57 +409,57 @@ void wxListBox::Clear()
 #endif // wxUSE_OWNER_DRAWN
 
     m_noItems = 0;
 #endif // wxUSE_OWNER_DRAWN
 
     m_noItems = 0;

-    ListBox_GetHorizontalExtent(hwnd);
+    ListBox_GetHorizontalExtent(GetHwnd());

 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 }
 
 void wxListBox::SetSelection(int N, bool select)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 
     if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
 
     if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))

-        SendMessage(hwnd, LB_SETSEL, select, N);
+        SendMessage(GetHwnd(), LB_SETSEL, select, N);

     else
     {
         int N1 = N;
         if (!select)
             N1 = -1;
     else
     {
         int N1 = N;
         if (!select)
             N1 = -1;

-        SendMessage(hwnd, LB_SETCURSEL, N1, 0);
+        SendMessage(GetHwnd(), LB_SETCURSEL, N1, 0);

     }
 }
 
 bool wxListBox::Selected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,
     }
 }
 
 bool wxListBox::Selected(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, FALSE,

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

 
 

-    return SendMessage(hwnd, LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;
+    return SendMessage(GetHwnd(), LB_GETSEL, N, 0) == 0 ? FALSE : TRUE;

 }
 
 void wxListBox::Deselect(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 }
 
 void wxListBox::Deselect(int N)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 
     if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
 
     if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))

-        SendMessage(hwnd, LB_SETSEL, FALSE, N);
+        SendMessage(GetHwnd(), LB_SETSEL, FALSE, N);

 }
 
 }
 

-char *wxListBox::GetClientData(int N) const
+void *wxListBox::GetClientData(int N) const

 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, NULL,

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

 
 

-    return (char *)SendMessage(hwnd, LB_GETITEMDATA, N, 0);
+    return (void *)SendMessage(GetHwnd(), LB_GETITEMDATA, N, 0);

 }
 
 }
 

-void wxListBox::SetClientData(int N, char *Client_data)
+void wxListBox::SetClientData(int N, void *Client_data)

 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 
 

-    if ( ListBox_SetItemData(hwnd, N, Client_data) == LB_ERR )
-        wxLogDebug("LB_SETITEMDATA failed");
+    if ( ListBox_SetItemData(GetHwnd(), N, Client_data) == LB_ERR )
+        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


@@ -439,11 +469,11 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
 
     if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
     {
 
     if ((m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED))
     {

-        int no_sel = ListBox_GetSelCount(hwnd);
+        int no_sel = ListBox_GetSelCount(GetHwnd());

         if (no_sel != 0) {
             int *selections = new int[no_sel];
         if (no_sel != 0) {
             int *selections = new int[no_sel];

-            if ( ListBox_GetSelItems(hwnd, no_sel, selections) == LB_ERR ) {
-                wxFAIL_MSG("This listbox can't have single-selection style!");
+            if ( ListBox_GetSelItems(GetHwnd(), no_sel, selections) == LB_ERR ) {
+                wxFAIL_MSG(wxT("This listbox can't have single-selection style!"));

             }
 
             aSelections.Alloc(no_sel);
             }
 
             aSelections.Alloc(no_sel);


@@ -457,7 +487,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
     }
     else  // single-selection listbox
     {
     }
     else  // single-selection listbox
     {

-        aSelections.Add(ListBox_GetCurSel(hwnd));
+        aSelections.Add(ListBox_GetCurSel(GetHwnd()));

 
         return 1;
     }
 
         return 1;
     }


@@ -469,87 +499,30 @@ int wxListBox::GetSelection() const
     wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) &&
                  !(m_windowStyle & wxLB_EXTENDED),
                  -1,
     wxCHECK_MSG( !(m_windowStyle & wxLB_MULTIPLE) &&
                  !(m_windowStyle & wxLB_EXTENDED),
                  -1,

-                 "GetSelection() can't be used with multiple-selection "
-                 "listboxes, use GetSelections() instead." );
+                 wxT("GetSelection() can't be used with multiple-selection "
+                    "listboxes, use GetSelections() instead.") );

 
 

-    return ListBox_GetCurSel(hwnd);
+    return ListBox_GetCurSel(GetHwnd());

 }
 
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, "",
 }
 
 // Find string for position
 wxString wxListBox::GetString(int N) const
 {
     wxCHECK_MSG( N >= 0 && N < m_noItems, "",

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

 
 

-    int len = ListBox_GetTextLen(hwnd, N);
+    int len = ListBox_GetTextLen(GetHwnd(), N);

 
     // +1 for terminating NUL
     wxString result;
 
     // +1 for terminating NUL
     wxString result;

-    ListBox_GetText(hwnd, N, result.GetWriteBuf(len + 1));
+    ListBox_GetText(GetHwnd(), N, result.GetWriteBuf(len + 1));

     result.UngetWriteBuf();
 
     return result;
 }
 
     result.UngetWriteBuf();
 
     return result;
 }
 

-void wxListBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    int currentX, currentY;
-    GetPosition(&currentX, &currentY);
-
-    int x1 = x;
-    int y1 = y;
-    int w1 = width;
-    int h1 = height;
-
-    if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        x1 = currentX;
-    if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-        y1 = currentY;
-
-    AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-    // If we're prepared to use the existing size, then...
-    if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
-    {
-        GetSize(&w1, &h1);
-    }
-
-    int cx; // button font dimensions
-    int cy;
-
-    wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());
-
-    float control_width, control_height, control_x, control_y;
-
-    // Deal with default size (using -1 values)
-    if (w1<=0)
-        w1 = DEFAULT_ITEM_WIDTH;
-
-    if (h1<=0)
-        h1 = DEFAULT_ITEM_HEIGHT;
-
-    control_x = (float)x1;
-    control_y = (float)y1;
-    control_width = (float)w1;
-    control_height = (float)h1;
-
-    // Calculations may have made size too small
-    if (control_height <= 0)
-        control_height = (float)DEFAULT_ITEM_HEIGHT;
-
-    if (control_width <= 0)
-        control_width = (float)DEFAULT_ITEM_WIDTH;
-
-    MoveWindow(hwnd,
-               (int)control_x, (int)control_y,
-               (int)control_width, (int)control_height,
-               TRUE);
-
-}
-
-// Windows-specific code to set the horizontal extent of
-// the listbox, if necessary. If s is non-NULL, it's
-// used to calculate the horizontal extent.
+// Windows-specific code to set the horizontal extent of the listbox, if
+// necessary. If s is non-NULL, it's used to calculate the horizontal extent.

 // Otherwise, all strings are used.
 void wxListBox::SetHorizontalExtent(const wxString& s)
 {
 // Otherwise, all strings are used.
 void wxListBox::SetHorizontalExtent(const wxString& s)
 {


@@ -558,31 +531,31 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         return;
     TEXTMETRIC lpTextMetric;
 
         return;
     TEXTMETRIC lpTextMetric;
 

-    if (s != "")
+    if (s != wxT(""))

     {
     {

-        int existingExtent = (int)SendMessage(hwnd, LB_GETHORIZONTALEXTENT, 0, 0L);
-        HDC dc = GetWindowDC(hwnd);
+        int existingExtent = (int)SendMessage(GetHwnd(), LB_GETHORIZONTALEXTENT, 0, 0L);
+        HDC dc = GetWindowDC(GetHwnd());

         HFONT oldFont = 0;
         if (GetFont().Ok() && GetFont().GetResourceHandle())
             oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
 
         GetTextMetrics(dc, &lpTextMetric);
         SIZE extentXY;
         HFONT oldFont = 0;
         if (GetFont().Ok() && GetFont().GetResourceHandle())
             oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
 
         GetTextMetrics(dc, &lpTextMetric);
         SIZE extentXY;

-        ::GetTextExtentPoint(dc, (LPSTR) (const char *)s, s.Length(), &extentXY);
+        ::GetTextExtentPoint(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY);

         int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
 
         if (oldFont)
             ::SelectObject(dc, oldFont);
 
         int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
 
         if (oldFont)
             ::SelectObject(dc, oldFont);
 

-        ReleaseDC(hwnd, dc);
+        ReleaseDC(GetHwnd(), dc);

         if (extentX > existingExtent)
         if (extentX > existingExtent)

-            SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);
+            SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(extentX), 0L);

         return;
     }
     else
     {
         int largestExtent = 0;
         return;
     }
     else
     {
         int largestExtent = 0;

-        HDC dc = GetWindowDC(hwnd);
+        HDC dc = GetWindowDC(GetHwnd());

         HFONT oldFont = 0;
         if (GetFont().Ok() && GetFont().GetResourceHandle())
             oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());
         HFONT oldFont = 0;
         if (GetFont().Ok() && GetFont().GetResourceHandle())
             oldFont = (HFONT) ::SelectObject(dc, (HFONT) GetFont().GetResourceHandle());


@@ -591,10 +564,10 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         int i;
         for (i = 0; i < m_noItems; i++)
         {
         int i;
         for (i = 0; i < m_noItems; i++)
         {

-            int len = (int)SendMessage(hwnd, LB_GETTEXT, i, (LONG)wxBuffer);
+            int len = (int)SendMessage(GetHwnd(), LB_GETTEXT, i, (LONG)wxBuffer);

             wxBuffer[len] = 0;
             SIZE extentXY;
             wxBuffer[len] = 0;
             SIZE extentXY;

-            ::GetTextExtentPoint(dc, (LPSTR)wxBuffer, len, &extentXY);
+            ::GetTextExtentPoint(dc, (LPTSTR)wxBuffer, len, &extentXY);

             int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
             if (extentX > largestExtent)
                 largestExtent = extentX;
             int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
             if (extentX > largestExtent)
                 largestExtent = extentX;


@@ -602,8 +575,8 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
         if (oldFont)
             ::SelectObject(dc, oldFont);
 
         if (oldFont)
             ::SelectObject(dc, oldFont);
 

-        ReleaseDC(hwnd, dc);
-        SendMessage(hwnd, LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);
+        ReleaseDC(GetHwnd(), dc);
+        SendMessage(GetHwnd(), LB_SETHORIZONTALEXTENT, LOWORD(largestExtent), 0L);

     }
 }
 
     }
 }
 


@@ -611,34 +584,34 @@ void
 wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,
 wxListBox::InsertItems(int nItems, const wxString items[], int pos)
 {
     wxCHECK_RET( pos >= 0 && pos <= m_noItems,

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

 
     int i;
     for (i = 0; i < nItems; i++)
 
     int i;
     for (i = 0; i < nItems; i++)

-        ListBox_InsertString(hwnd, i + pos, items[i]);
+        ListBox_InsertString(GetHwnd(), i + pos, items[i]);

     m_noItems += nItems;
 
     m_noItems += nItems;
 

-    SetHorizontalExtent("");
+    SetHorizontalExtent(wxT(""));

 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,
 }
 
 void wxListBox::SetString(int N, const wxString& s)
 {
     wxCHECK_RET( N >= 0 && N < m_noItems,

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

 
     int sel = -1;
     if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED))
         sel = GetSelection();
 
 
     int sel = -1;
     if (!(m_windowStyle & wxLB_MULTIPLE) && !(m_windowStyle & wxLB_EXTENDED))
         sel = GetSelection();
 

-    char *oldData = (char *)wxListBox::GetClientData(N);
+    void *oldData = wxListBox::GetClientData(N);

 
 

-    SendMessage(hwnd, LB_DELETESTRING, N, 0);
+    SendMessage(GetHwnd(), LB_DELETESTRING, N, 0);

 
     int newN = N;
     if (N == (m_noItems - 1))
         newN = -1;
 
 
     int newN = N;
     if (N == (m_noItems - 1))
         newN = -1;
 

-    SendMessage(hwnd, LB_INSERTSTRING, newN, (LPARAM) (const char *)s);
+    SendMessage(GetHwnd(), LB_INSERTSTRING, newN, (LPARAM) (const wxChar *)s);

     if (oldData)
         wxListBox::SetClientData(N, oldData);
 
     if (oldData)
         wxListBox::SetClientData(N, oldData);
 


@@ -680,6 +653,35 @@ bool wxListBox::SetStringSelection (const wxString& s, bool flag)
         return FALSE;
 }
 
         return FALSE;
 }
 

+wxSize wxListBox::DoGetBestSize()
+{
+    // find the widest string
+    int wLine;
+    int wListbox = 0;
+    for ( int i = 0; i < m_noItems; i++ )
+    {
+        wxString str(GetString(i));
+        GetTextExtent(str, &wLine, NULL);
+        if ( wLine > wListbox )
+            wListbox = wLine;
+    }
+
+    // give it some reasonable default value if there are no strings in the
+    // list
+    if ( wListbox == 0 )
+        wListbox = 100;
+
+    // the listbox should be slightly larger than the widest string
+    int cx, cy;
+    wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
+
+    wListbox += 3*cx;
+
+    int hListbox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(wxMax(m_noItems, 7));
+
+    return wxSize(wListbox, hListbox);
+}
+

 // Is this the right thing? Won't setselection generate a command
 // event too? No! It'll just generate a setselection event.
 // But we still can't have this being called whenever a real command
 // Is this the right thing? Won't setselection generate a command
 // event too? No! It'll just generate a setselection event.
 // But we still can't have this being called whenever a real command


@@ -752,7 +754,7 @@ bool wxListBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
     wxDC dc;
     MEASUREITEMSTRUCT *pStruct = (MEASUREITEMSTRUCT *)item;
 
     wxDC dc;

-    dc.SetHDC((WXHDC)CreateIC("DISPLAY", NULL, NULL, 0));
+    dc.SetHDC((WXHDC)CreateIC(wxT("DISPLAY"), NULL, NULL, 0));

     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
 
     pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;
     dc.SetFont(wxSystemSettings::GetSystemFont(wxSYS_ANSI_VAR_FONT));
 
     pStruct->itemHeight = dc.GetCharHeight() + 2*OWNER_DRAWN_LISTBOX_EXTRA_SPACE;


@@ -769,7 +771,7 @@ bool wxListBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
 
 
     DRAWITEMSTRUCT *pStruct = (DRAWITEMSTRUCT *)item;
 

-    long data = ListBox_GetItemData(hwnd, pStruct->itemID);
+    long data = ListBox_GetItemData(GetHwnd(), pStruct->itemID);

 
     wxCHECK( data && (data != LB_ERR), FALSE );
 
 
     wxCHECK( data && (data != LB_ERR), FALSE );