non-pch build fix

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

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index f1501642526bf45992322e0edee41b1190753c9f..770da88cccc274c1e4c1cba5edc3043f166adca9 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        choice.cpp
+// Name:        src/os2/choice.cpp

 // Purpose:     wxChoice
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxChoice
 // Author:      David Webster
 // Modified by:


@@ -12,12 +12,11 @@
 // 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
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/settings.h"


@@ -71,8 +70,9 @@ bool wxChoice::Create(
               WS_TABSTOP       |
               WS_VISIBLE;
 
               WS_TABSTOP       |
               WS_VISIBLE;
 

-    if (lStyle & wxCLIP_SIBLINGS )
-        lSstyle |= WS_CLIPSIBLINGS;
+    // clipping siblings does not yet work
+    // if (lStyle & wxCLIP_SIBLINGS )
+    //     lSstyle |= WS_CLIPSIBLINGS;

 
     wxASSERT_MSG( !(lStyle & wxCB_DROPDOWN) &&
                   !(lStyle & wxCB_READONLY) &&
 
     wxASSERT_MSG( !(lStyle & wxCB_DROPDOWN) &&
                   !(lStyle & wxCB_READONLY) &&


@@ -90,25 +90,33 @@ bool wxChoice::Create(
     // on global settings) rather than inheriting the parent's background colour.
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     // on global settings) rather than inheriting the parent's background colour.
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));

+
+    // initialize the controls contents

     for (int i = 0; i < n; i++)
     {
         Append(asChoices[i]);
     }
     for (int i = 0; i < n; i++)
     {
         Append(asChoices[i]);
     }

-    wxFont*                          pTextFont = new wxFont( 10
-                                                            ,wxMODERN
-                                                            ,wxNORMAL
-                                                            ,wxNORMAL
-                                                           );
-    SetFont(*pTextFont);

     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x
             ,rSize.y
            );

-    delete pTextFont;
+
+    // Set height to use with sizers i.e. without the dropdown listbox
+    wxFont vFont = GetFont();
+    int  nEditHeight;
+    wxGetCharSize( GetHWND(), NULL, &nEditHeight, &vFont );
+    nEditHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nEditHeight);
+    SetBestFittingSize(wxSize(-1,nEditHeight+4));   // +2x2 for the border
+

     return true;
 } // end of wxChoice::Create
 
     return true;
 } // end of wxChoice::Create
 

+wxChoice::~wxChoice()
+{
+    Free();
+}
+

 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------


@@ -119,8 +127,7 @@ int wxChoice::DoAppend(
 {
     int                             nIndex;
     LONG                            nIndexType = 0;
 {
     int                             nIndex;
     LONG                            nIndexType = 0;

-
-    if (m_windowStyle & wxLB_SORT)
+    if (m_windowStyle & wxCB_SORT)

         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = LIT_END;
         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = LIT_END;


@@ -132,21 +139,18 @@ int wxChoice::DoAppend(
     return nIndex;
 } // end of wxChoice::DoAppend
 
     return nIndex;
 } // end of wxChoice::DoAppend
 

-int wxChoice::DoInsert(
-  const wxString&                   rsItem,
-  int                               pos
-)
+int wxChoice::DoInsert( const wxString& rsItem, unsigned int pos )

 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));
 {
     wxCHECK_MSG(!(GetWindowStyle() & wxCB_SORT), -1, wxT("can't insert into sorted list"));

-    wxCHECK_MSG((pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
+    wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));

 
     if (pos == GetCount())
         return DoAppend(rsItem);
 
 
     if (pos == GetCount())
         return DoAppend(rsItem);
 

-    int                             nIndex;
-    LONG                            nIndexType = 0;
+    int  nIndex;
+    LONG nIndexType = 0;

 
 

-    if (m_windowStyle & wxLB_SORT)
+    if (m_windowStyle & wxCB_SORT)

         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = pos;
         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = pos;


@@ -158,11 +162,15 @@ int wxChoice::DoInsert(
     return nIndex;
 } // end of wxChoice::DoInsert
 
     return nIndex;
 } // end of wxChoice::DoInsert
 

-void wxChoice::Delete(
-  int                               n
-)
+void wxChoice::Delete(unsigned int n)

 {
 {

-    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+    wxCHECK_RET( IsValid(n), wxT("invalid item index in wxChoice::Delete") );
+
+    if ( HasClientObjectData() )
+    {
+        delete GetClientObject(n);
+    }
+

     ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);
 } // end of wxChoice::Delete
 
     ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, (MPARAM)0);
 } // end of wxChoice::Delete
 


@@ -196,43 +204,15 @@ void wxChoice::SetSelection(
 // string list functions
 // ----------------------------------------------------------------------------
 
 // string list functions
 // ----------------------------------------------------------------------------
 

-int wxChoice::GetCount() const
+unsigned int wxChoice::GetCount() const

 {
 {

-    return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));
+    return((unsigned int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0)));

 } // end of wxChoice::GetCount
 
 } // end of wxChoice::GetCount
 

-int wxChoice::FindString(
-  const wxString&                   rsStr
-) const
-{
-    int                             nPos;
-    int                             nTextLength;
-    PSZ                             zStr;
-    int                             nItemCount;
-
-    nItemCount = (int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMCOUNT, (MPARAM)0, (MPARAM)0));
-    for (nPos = 0; nPos < nItemCount; nPos++)
-    {
-        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 == (wxChar*)zStr)
-        {
-            delete [] zStr;
-            break;
-        }
-        delete [] zStr;
-    }
-    return nPos;
-} // end of wxChoice::FindString
-
-void wxChoice::SetString(
-  int                               n
-, const wxString&                   rsStr
-)
+void wxChoice::SetString(unsigned int n, const wxString& rsStr)

 {
 {

-    LONG                            nIndexType = 0;
-    void*                           pData;
+    LONG  nIndexType = 0;
+    void* pData;

 
     if ( m_clientDataItemsType != wxClientData_None )
     {
 
     if ( m_clientDataItemsType != wxClientData_None )
     {


@@ -245,7 +225,7 @@ void wxChoice::SetString(
 
     ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0);
 
 
     ::WinSendMsg(GetHwnd(), LM_DELETEITEM, (MPARAM)n, 0);
 

-    if (m_windowStyle & wxLB_SORT)
+    if (m_windowStyle & wxCB_SORT)

         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = LIT_END;
         nIndexType = LIT_SORTASCENDING;
     else
         nIndexType = LIT_END;


@@ -257,24 +237,20 @@ void wxChoice::SetString(
 
     if (pData)
     {
 
     if (pData)
     {

-        DoSetItemClientData( n
-                            ,pData
-                           );
+        DoSetItemClientData(n, pData);

     }
 } // end of wxChoice::SetString
 
     }
 } // end of wxChoice::SetString
 

-wxString wxChoice::GetString(
-  int                               n
-) const
+wxString wxChoice::GetString(unsigned int n) const

 {
 {

-    int                             nLen = 0;
-    wxString                        sStr = wxEmptyString;
-    wxChar*                         zBuf;
+    int      nLen = 0;
+    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 wxChar[nLen + 1];
+        zBuf = new wxChar[++nLen];

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


@@ -290,35 +266,23 @@ wxString wxChoice::GetString(
 // client data
 // ----------------------------------------------------------------------------
 
 // client data
 // ----------------------------------------------------------------------------
 

-void wxChoice::DoSetItemClientData(
-  int                               n
-, void*                             pClientData
-)
+void wxChoice::DoSetItemClientData(unsigned int n, void* pClientData)

 {
     ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pClientData));
 } // end of wxChoice::DoSetItemClientData
 
 {
     ::WinSendMsg(GetHwnd(), LM_SETITEMHANDLE, (MPARAM)n, MPFROMP(pClientData));
 } // end of wxChoice::DoSetItemClientData
 

-void* wxChoice::DoGetItemClientData( int n ) const
+void* wxChoice::DoGetItemClientData(unsigned int n) const

 {
 {

-    MRESULT                         rc = 0L;
-
-    rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0);
+    MRESULT rc = ::WinSendMsg(GetHwnd(), LM_QUERYITEMHANDLE, (MPARAM)n, (MPARAM)0);

     return((void*)rc);
     return((void*)rc);

-} // end of wxChoice::DoSetItemClientData
+} // end of wxChoice::DoGetItemClientData

 
 

-void wxChoice::DoSetItemClientObject(
-  int                               n
-, wxClientData*                     pClientData
-)
+void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* pClientData)

 {
 {

-    DoSetItemClientData( n
-                        ,pClientData
-                       );
+    DoSetItemClientData(n, pClientData);

 } // end of wxChoice::DoSetItemClientObject
 
 } // end of wxChoice::DoSetItemClientObject
 

-wxClientData* wxChoice::DoGetItemClientObject(
-  int                               n
-) const
+wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const

 {
     return (wxClientData *)DoGetItemClientData(n);
 } // end of wxChoice::DoGetItemClientObject
 {
     return (wxClientData *)DoGetItemClientData(n);
 } // end of wxChoice::DoGetItemClientObject


@@ -353,21 +317,18 @@ wxSize wxChoice::DoGetBestSize() const
     //
     // Find the widest string
     //
     //
     // Find the widest string
     //

-    int                             nLineWidth;
-    int                             nChoiceWidth = 0;
-    int                             nItems = GetCount();
-    int                             nCx;
-    int                             nCy;
-    wxFont                          vFont = (wxFont)GetFont();
-
-    for (int i = 0; i < nItems; i++)
-    {
-        wxString                    sStr(GetString(i));
+    int    nLineWidth;
+    int    nChoiceWidth = 0;
+    int    nCx;
+    int    nCy;
+    wxFont vFont = (wxFont)GetFont();

 
 

-        GetTextExtent( sStr
-                      ,&nLineWidth
-                      ,NULL
-                     );
+    const unsigned int nItems = GetCount();
+
+    for (unsigned int i = 0; i < nItems; i++)
+    {
+        wxString sStr(GetString(i));
+        GetTextExtent( sStr, &nLineWidth, NULL );

         if (nLineWidth > nChoiceWidth)
             nChoiceWidth = nLineWidth;
     }
         if (nLineWidth > nChoiceWidth)
             nChoiceWidth = nLineWidth;
     }


@@ -382,22 +343,16 @@ wxSize wxChoice::DoGetBestSize() const
     //
     // The combobox should be larger than the widest string
     //
     //
     // The combobox should be larger than the widest string
     //

-    wxGetCharSize( GetHWND()
-                  ,&nCx
-                  ,&nCy
-                  ,&vFont
-                 );
+    wxGetCharSize( GetHWND(), &nCx, &nCy, &vFont );

     nChoiceWidth += 5 * nCx;
 
     //
     // Choice drop-down list depends on number of items (limited to 10)
     //
     nChoiceWidth += 5 * nCx;
 
     //
     // Choice drop-down list depends on number of items (limited to 10)
     //

-    size_t                          nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
-    int                             nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings;
+    size_t nStrings = nItems == 0 ? 10 : wxMin(10, nItems) + 1;
+    int    nChoiceHeight = EDIT_HEIGHT_FROM_CHAR_HEIGHT(nCy) * nStrings;

 
 

-    return wxSize( nChoiceWidth
-                  ,nChoiceHeight
-                 );
+    return wxSize(nChoiceWidth, nChoiceHeight);

 } // end of wxChoice::DoGetBestSize
 
 MRESULT wxChoice::OS2WindowProc(
 } // end of wxChoice::DoGetBestSize
 
 MRESULT wxChoice::OS2WindowProc(


@@ -448,9 +403,9 @@ void wxChoice::Free()
 {
     if (HasClientObjectData())
     {
 {
     if (HasClientObjectData())
     {

-        size_t                      nCount = GetCount();
+        const unsigned int nCount = GetCount();

 
 

-        for (size_t n = 0; n < nCount; n++)
+        for (unsigned int n = 0; n < nCount; n++)

         {
             delete GetClientObject(n);
         }
         {
             delete GetClientObject(n);
         }