set best fitting size for the toolbar in Realize()

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

diff --git a/src/os2/listbox.cpp b/src/os2/listbox.cpp
index 7cbcb464b9f909543d0fa1fa0d290b3955153449..ec5c2588edb43d60ba118e77439c65cd78a5ca12 100644 (file)
--- a/src/os2/listbox.cpp
+++ b/src/os2/listbox.cpp
@@ -49,7 +49,7 @@
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:
 class wxListBoxItem : public wxOwnerDrawn
 {
 public:

-    wxListBoxItem(const wxString& rsStr = "");
+    wxListBoxItem(const wxString& rsStr = wxEmptyString);

 };
 
 wxListBoxItem::wxListBoxItem(
 };
 
 wxListBoxItem::wxListBoxItem(


@@ -65,9 +65,7 @@ wxListBoxItem::wxListBoxItem(
     SetMarginWidth(0);
 } // end of wxListBoxItem::wxListBoxItem
 
     SetMarginWidth(0);
 } // end of wxListBoxItem::wxListBoxItem
 

-wxOwnerDrawn* wxListBox::CreateItem(
-  size_t                            n
-)
+wxOwnerDrawn* wxListBox::CreateItem( size_t WXUNUSED(n) )

 {
     return new wxListBoxItem();
 } // end of wxListBox::CreateItem
 {
     return new wxListBoxItem();
 } // end of wxListBox::CreateItem


@@ -198,7 +196,7 @@ bool wxListBox::Create(
     //
     wxColour                        vColour;
 
     //
     wxColour                        vColour;
 

-    vColour.Set(wxString("WHITE"));
+    vColour.Set(wxString(wxT("WHITE")));

 
     LONG                            lColor = (LONG)vColour.GetPixel();
 
 
     LONG                            lColor = (LONG)vColour.GetPixel();
 


@@ -207,7 +205,7 @@ bool wxListBox::Create(
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );

-    vColour.Set(wxString("NAVY"));
+    vColour.Set(wxString(wxT("NAVY")));

     lColor = (LONG)vColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_HILITEBACKGROUNDCOLOR
     lColor = (LONG)vColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_HILITEBACKGROUNDCOLOR


@@ -380,7 +378,7 @@ int wxListBox::FindString(
         lTextLength = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
         zStr = new char[lTextLength + 1];
         ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT(nPos, (SHORT)lTextLength), (MPARAM)zStr);
         lTextLength = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)nPos, (MPARAM)0));
         zStr = new char[lTextLength + 1];
         ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT(nPos, (SHORT)lTextLength), (MPARAM)zStr);

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

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


@@ -415,7 +413,7 @@ void wxListBox::Clear()
     m_nNumItems = 0;
 } // end of wxListBox::Clear
 
     m_nNumItems = 0;
 } // end of wxListBox::Clear
 

-void wxListBox::SetSelection(
+void wxListBox::DoSetSelection(

   int                               N
 , bool                              bSelect
 )
   int                               N
 , bool                              bSelect
 )


@@ -508,9 +506,7 @@ bool wxListBox::HasMultipleSelection() const
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 } // end of wxListBox::HasMultipleSelection
 
     return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED);
 } // end of wxListBox::HasMultipleSelection
 

-int wxListBox::GetSelections(
-  wxArrayInt&                       raSelections
-) const
+int wxListBox::GetSelections( wxArrayInt& raSelections ) const

 {
     int                             nCount = 0;
     LONG                            lItem;
 {
     int                             nCount = 0;
     LONG                            lItem;


@@ -557,7 +553,6 @@ int wxListBox::GetSelections(
             }
             return nCount;
         }
             }
             return nCount;
         }

-        return 0;

     }
     else  // single-selection listbox
     {
     }
     else  // single-selection listbox
     {


@@ -593,14 +588,14 @@ wxString wxListBox::GetString(
 ) const
 {
     LONG                            lLen = 0;
 ) const
 {
     LONG                            lLen = 0;

-    char*                           zBuf;
+    wxChar*                         zBuf;

     wxString                        sResult;
 
     wxString                        sResult;
 

-    wxCHECK_MSG( N >= 0 && N < m_nNumItems, "",
+    wxCHECK_MSG( N >= 0 && N < m_nNumItems, wxEmptyString,

                  wxT("invalid index in wxListBox::GetClientData") );
 
     lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)N, (MPARAM)0));
                  wxT("invalid index in wxListBox::GetClientData") );
 
     lLen = LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXTLENGTH, (MPARAM)N, (MPARAM)0));

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

     ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)N, (SHORT)lLen), (MPARAM)zBuf);
     zBuf[lLen] = '\0';
     sResult = zBuf;
     ::WinSendMsg(GetHwnd(), LM_QUERYITEMTEXT, MPFROM2SHORT((SHORT)N, (SHORT)lLen), (MPARAM)zBuf);
     zBuf[lLen] = '\0';
     sResult = zBuf;


@@ -725,6 +720,7 @@ wxSize wxListBox::DoGetBestSize() const
     int                             nListbox = 0;
     int                             nCx;
     int                             nCy;
     int                             nListbox = 0;
     int                             nCx;
     int                             nCy;

+    wxFont                          vFont = (wxFont)GetFont();

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


@@ -751,7 +747,7 @@ wxSize wxListBox::DoGetBestSize() const
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy
     wxGetCharSize( GetHWND()
                   ,&nCx
                   ,&nCy

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

                  );
     nListbox += 3 * nCx;
 
                  );
     nListbox += 3 * nCx;
 


@@ -810,7 +806,7 @@ bool wxListBox::OS2Command(
     {
         n = -1;
     }
     {
         n = -1;
     }

-    vEvent.m_commandInt = n;
+    vEvent.SetInt(n);

     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxListBox::OS2Command
 
     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxListBox::OS2Command
 


@@ -891,14 +887,10 @@ bool wxListBox::OS2OnDraw (
 
     wxCHECK(pData, false );
 
 
     wxCHECK(pData, false );
 

-    wxDC                              vDc;
-    wxRect                            vRect( wxPoint( pDrawStruct->rclItem.xLeft
-                                                     ,pDrawStruct->rclItem.yTop
-                                                    )
-                                            ,wxPoint( pDrawStruct->rclItem.xRight
-                                                     ,pDrawStruct->rclItem.yBottom
-                                                    )
-                                           );
+    wxDC    vDc;
+    wxPoint pt1( pDrawStruct->rclItem.xLeft, pDrawStruct->rclItem.yTop );
+    wxPoint pt2( pDrawStruct->rclItem.xRight, pDrawStruct->rclItem.yBottom );
+    wxRect  vRect( pt1, pt2 );

 
     vDc.SetHPS(pDrawStruct->hps);
 
 
     vDc.SetHPS(pDrawStruct->hps);
 


@@ -975,4 +967,3 @@ bool wxListBox::OS2OnDraw (
 #endif // ndef for wxUSE_OWNER_DRAWN
 
 #endif // ndef for wxUSE_LISTBOX
 #endif // ndef for wxUSE_OWNER_DRAWN
 
 #endif // ndef for wxUSE_LISTBOX

-