Suppose I should trust the headers in BC++5.02 more than BC++4.52

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

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 9688accf39fda261a94ef9a44343249ce2207cb4..3f349227d3d863b8ed88c5aed305ab92b5d1120c 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include "wx/choice.h"
 
 #ifndef WX_PRECOMP
 #include "wx/choice.h"

+#include "wx/utils.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -37,12 +38,13 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
     event.SetInt(GetSelection());
     event.SetEventObject(this);
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId);
     event.SetInt(GetSelection());
     event.SetEventObject(this);

-    event.SetString(copystring(GetStringSelection()));
+    event.SetString(GetStringSelection());

     ProcessCommand(event);
     ProcessCommand(event);

-    delete[] event.GetString();
+

     return TRUE;
   }
     return TRUE;
   }

-  else return FALSE;
+  else
+      return FALSE;

 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,


@@ -58,7 +60,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;
   if (parent) parent->AddChild(this);
   SetBackgroundColour(parent->GetBackgroundColour()) ;
   SetForegroundColour(parent->GetForegroundColour()) ;

-  m_noStrings = n;
+  m_noStrings = 0;

 
   m_windowStyle = style;
 
 
   m_windowStyle = style;
 


@@ -85,15 +87,15 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;
 
   if ( want3D || wxStyleHasBorder(m_windowStyle) )
     msStyle |= WS_BORDER;
 

-  m_hWnd = (WXHWND)::CreateWindowEx(exStyle, "COMBOBOX", NULL,
+  m_hWnd = (WXHWND)::CreateWindowEx(exStyle, _T("COMBOBOX"), NULL,

                    msStyle,
                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                    wxGetInstance(), NULL);
 
                    msStyle,
                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                    wxGetInstance(), NULL);
 

-  wxCHECK_MSG( m_hWnd, FALSE, "Failed to create combobox" );
+  wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create combobox") );

 
 /*
 
 /*

-#if CTL3D
+#if wxUSE_CTL3D

   if (want3D)
   {
     m_useCtl3D = TRUE;
   if (want3D)
   {
     m_useCtl3D = TRUE;


@@ -105,7 +107,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin(m_hWnd);
 

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

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


@@ -121,7 +123,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
 void wxChoice::Append(const wxString& item)
 {
 
 void wxChoice::Append(const wxString& item)
 {

-  SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
+  SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const wxChar *)item);

 
   m_noStrings ++;
 }
 
   m_noStrings ++;
 }


@@ -164,7 +166,7 @@ int wxChoice::FindString(const wxString& s) const
   }
   return -1;
 #else
   }
   return -1;
 #else

- int pos = (int)SendMessage((HWND) GetHWND(), CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)(LPSTR)(const char *)s);
+ int pos = (int)SendMessage((HWND) GetHWND(), CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)(LPSTR)(const wxChar *)s);

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


@@ -179,7 +181,7 @@ wxString wxChoice::GetString(int n) const
   return wxString(wxBuffer);
 }
 
   return wxString(wxBuffer);
 }
 

-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);
 {
   int currentX, currentY;
   GetPosition(&currentX, &currentY);


@@ -204,7 +206,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
 
   int cx; // button font dimensions
   int cy;
 
   int cx; // button font dimensions
   int cy;

-  wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());

 
   int control_width, control_height;
 
 
   int control_width, control_height;
 


@@ -232,7 +234,7 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
       for (i = 0; i < m_noStrings; i++)
       {
         wxString str(GetString(i));
       for (i = 0; i < m_noStrings; i++)
       {
         wxString str(GetString(i));

-        GetTextExtent(str, &len, &ht, NULL, NULL,GetFont());
+        GetTextExtent(str, &len, &ht, NULL, NULL, & this->GetFont());

         if ( len > longest)
             longest = len;
       }
         if ( len > longest)
             longest = len;
       }


@@ -311,7 +313,7 @@ long wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
        // with x = 65535 and y = 65535.
        // Filter out this nonsense.
        if (x == 65535 && y == 65535)
        // with x = 65535 and y = 65535.
        // Filter out this nonsense.
        if (x == 65535 && y == 65535)

-         return Default();
+         return 0;

        break;
       }
     }
        break;
       }
     }


@@ -325,7 +327,7 @@ wxString wxChoice::GetStringSelection (void) const
   if (sel > -1)
     return wxString(this->GetString (sel));
   else
   if (sel > -1)
     return wxString(this->GetString (sel));
   else

-    return wxString("");
+    return wxString(_T(""));

 }
 
 bool wxChoice::SetStringSelection (const wxString& s)
 }
 
 bool wxChoice::SetStringSelection (const wxString& s)