Reverted/commented out unsuccessful defer fix

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 1320c33442a4b3900129b642b3dfb4b973774792..7a5cee50855d16c24309d0386915790d1183e5db 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -6,12 +6,16 @@
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#include "wx/defs.h"
+
+#if wxUSE_CHOICE
+

 #ifndef WX_PRECOMP
     #include "wx/choice.h"
     #include "wx/utils.h"
 #ifndef WX_PRECOMP
     #include "wx/choice.h"
     #include "wx/utils.h"


@@ -62,7 +66,7 @@ bool wxChoice::Create(
                        ,rValidator
                        ,rsName
                       ))
                        ,rValidator
                        ,rsName
                       ))

-        return FALSE;
+        return false;

     lSstyle = CBS_DROPDOWNLIST |
               WS_TABSTOP       |
               WS_VISIBLE;
     lSstyle = CBS_DROPDOWNLIST |
               WS_TABSTOP       |
               WS_VISIBLE;


@@ -79,7 +83,7 @@ bool wxChoice::Create(
     if (!OS2CreateControl( wxT("COMBOBOX")
                           ,lSstyle
                          ))
     if (!OS2CreateControl( wxT("COMBOBOX")
                           ,lSstyle
                          ))

-        return FALSE;
+        return false;

 
     //
     // A choice/combobox normally has a white background (or other, depending
 
     //
     // A choice/combobox normally has a white background (or other, depending


@@ -102,7 +106,7 @@ bool wxChoice::Create(
             ,rSize.y
            );
     delete pTextFont;
             ,rSize.y
            );
     delete pTextFont;

-    return TRUE;
+    return true;

 } // end of wxChoice::Create
 
 // ----------------------------------------------------------------------------
 } // end of wxChoice::Create
 
 // ----------------------------------------------------------------------------


@@ -212,7 +216,7 @@ int wxChoice::FindString(
         nTextLength = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
         zStr = new char[nTextLength + 1];
         ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)nPos, (SHORT)nTextLength), (MPARAM)zStr);
         nTextLength = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
         zStr = new char[nTextLength + 1];
         ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)nPos, (SHORT)nTextLength), (MPARAM)zStr);

-        if (rsStr == (char*)zStr)
+        if (rsStr == (wxChar*)zStr)

         {
             delete [] zStr;
             break;
         {
             delete [] zStr;
             break;


@@ -264,13 +268,13 @@ wxString wxChoice::GetString(
 ) const
 {
     int                             nLen = 0;
 ) const
 {
     int                             nLen = 0;

-    wxString                        sStr = "";
-    char*                           zBuf;
+    wxString                        sStr = wxEmptyString;
+    wxChar*                         zBuf;

 
     nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
     if (nLen != LIT_ERROR && nLen > 0)
     {
 
     nLen = (size_t)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)n, (MPARAM)0));
     if (nLen != LIT_ERROR && nLen > 0)
     {

-        zBuf = new char[nLen + 1];
+        zBuf = new wxChar[nLen + 1];

         ::WinSendMsg( GetHwnd()
                      ,LM_QUERYITEMTEXT
                      ,MPFROM2SHORT((SHORT)n, (SHORT)nLen)
         ::WinSendMsg( GetHwnd()
                      ,LM_QUERYITEMTEXT
                      ,MPFROM2SHORT((SHORT)n, (SHORT)nLen)


@@ -356,6 +360,7 @@ wxSize wxChoice::DoGetBestSize() const
     int                             nItems = GetCount();
     int                             nCx;
     int                             nCy;
     int                             nItems = GetCount();
     int                             nCx;
     int                             nCy;

+    wxFont                          vFont = (wxFont)GetFont();

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


@@ -382,7 +387,7 @@ wxSize wxChoice::DoGetBestSize() const
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

-                  ,(wxFont*)&GetFont()
+                  ,&vFont

                  );
     nChoiceWidth += 5 * nCx;
 
                  );
     nChoiceWidth += 5 * nCx;
 


@@ -419,7 +424,7 @@ bool wxChoice::OS2Command(
         //
         // "selection changed" is the only event we're after
         //
         //
         // "selection changed" is the only event we're after
         //

-        return FALSE;
+        return false;

     }
     int                             n = GetSelection();
 
     }
     int                             n = GetSelection();
 


@@ -431,14 +436,14 @@ bool wxChoice::OS2Command(
 
         vEvent.SetInt(n);
         vEvent.SetEventObject(this);
 
         vEvent.SetInt(n);
         vEvent.SetEventObject(this);

-        vEvent.SetString((char*)GetStringSelection().c_str());
+        vEvent.SetString(GetStringSelection());

         if (HasClientObjectData())
             vEvent.SetClientObject(GetClientObject(n));
         else if (HasClientUntypedData())
             vEvent.SetClientData(GetClientData(n));
         ProcessCommand(vEvent);
     }
         if (HasClientObjectData())
             vEvent.SetClientObject(GetClientObject(n));
         else if (HasClientUntypedData())
             vEvent.SetClientData(GetClientData(n));
         ProcessCommand(vEvent);
     }

-    return TRUE;
+    return true;

 } // end of wxChoice::OS2Command
 
 void wxChoice::Free()
 } // end of wxChoice::OS2Command
 
 void wxChoice::Free()


@@ -452,4 +457,6 @@ void wxChoice::Free()
             delete GetClientObject(n);
         }
     }
             delete GetClientObject(n);
         }
     }

-} // end of wxhoice::Free
+} // end of wxChoice::Free
+
+#endif // wxUSE_CHOICE