added wx/platform.h to the list of files and regenerated the makefiles

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index b17715ec55978a54a7610c2253651ff8670901ed..502394e18a7221b6746ea924a98f2a19b84d88fe 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -32,7 +32,7 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;
 
 extern "C" void MacDrawStringCell(Rect *cellRect, Cell lCell, ListHandle theList, long refCon) ;
 const short kwxMacListWithVerticalScrollbar = 128 ;


@@ -99,10 +99,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 #else
     long       result ;
 
 #else
     long       result ;
 

-    m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,

                                  kwxMacListWithVerticalScrollbar , 0 , 0, 
                                  kControlListBoxProc , (long) this ) ;
                                  kwxMacListWithVerticalScrollbar , 0 , 0, 
                                  kControlListBoxProc , (long) this ) ;

-    UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
+    ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,

                       sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;
                       sizeof( ListHandle ) , (char*) &m_macList  , &result ) ;
 
     HLock( (Handle) m_macList ) ;


@@ -664,7 +664,7 @@ void wxListBox::MacHandleControlClick( ControlHandle control , SInt16 controlpar
        Boolean wasDoubleClick = false ;
        long    result ;
 
        Boolean wasDoubleClick = false ;
        long    result ;
 

-       UMAGetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;
+       ::GetControlData( m_macControl , kControlNoPart , kControlListBoxDoubleClickTag , sizeof( wasDoubleClick ) , (char*) &wasDoubleClick  , &result ) ;

        if ( !wasDoubleClick )
        {
                MacDoClick() ;
        if ( !wasDoubleClick )
        {
                MacDoClick() ;