stubs for wxUSE_DBGHELP == 0

[wxWidgets.git] / src / mac / carbon / listbox.cpp

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index ebb9ee5ff91b7fc4de0a61819436327fc21523c4..7c8ca90473a7d0543e69f4c9feca6fff7666c996 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -9,10 +9,12 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "listbox.h"
 #endif
 
 #pragma implementation "listbox.h"
 #endif
 

+#include "wx/wxprec.h"
+

 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/button.h"


@@ -28,7 +30,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 #ifndef __WXMAC_OSX__
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 #ifndef __WXMAC_OSX__

-    EVT_SIZE( wxListBox::OnSize )
+//    EVT_SIZE( wxListBox::OnSize )

     EVT_CHAR( wxListBox::OnChar )
 #endif
 END_EVENT_TABLE()
     EVT_CHAR( wxListBox::OnChar )
 #endif
 END_EVENT_TABLE()


@@ -654,7 +656,7 @@ void wxListBox::MacDelete( int n )
 
     UInt32 id = m_noItems+1 ;
     verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;
 
     UInt32 id = m_noItems+1 ;
     verify_noerr( m_peer->RemoveItems( kDataBrowserNoItem , 1 , (UInt32*) &id , kDataBrowserItemNoProperty ) ) ;

-    for ( int i = 0 ; i < selectionBefore.GetCount() ; ++i )
+    for ( size_t i = 0 ; i < selectionBefore.GetCount() ; ++i )

     {
         int current = selectionBefore[i] ;
         if ( current == n )
     {
         int current = selectionBefore[i] ;
         if ( current == n )


@@ -764,7 +766,7 @@ int wxListBox::MacGetSelections( wxArrayInt& aSelections ) const
     m_peer->GetSelectionAnchor( &first , &last ) ;
     if ( first != kDataBrowserNoItem )
     {
     m_peer->GetSelectionAnchor( &first , &last ) ;
     if ( first != kDataBrowserNoItem )
     {

-        for ( int i = first ; i <= last ; ++i )
+        for ( size_t i = first ; i <= last ; ++i )

         {
             if ( m_peer->IsItemSelected( i ) )
             {
         {
             if ( m_peer->IsItemSelected( i ) )
             {


@@ -864,7 +866,7 @@ void wxListBox::OnChar(wxKeyEvent& event)
             n = -1;
         }
         
             n = -1;
         }
         

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

         
         GetEventHandler()->ProcessEvent(event);
     }
         
         GetEventHandler()->ProcessEvent(event);
     }


@@ -891,7 +893,7 @@ void wxListBox::OnChar(wxKeyEvent& event)
                     event.SetClientData( GetClientData(line) );
                 event.SetString( GetString(line) );
                 
                     event.SetClientData( GetClientData(line) );
                 event.SetString( GetString(line) );
                 

-                event.m_commandInt = line ;
+                event.SetInt(line);

                 
                 GetEventHandler()->ProcessEvent(event);
             }
                 
                 GetEventHandler()->ProcessEvent(event);
             }