cleaned drawing code

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index ffbe8e70358ce8c5e161d65fd4edbe8844b9fd69..4358e40e2e1ece7f4df8fa2e1beee89c49d0d819 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -16,13 +16,11 @@
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/settings.h"
+#include "wx/toplevel.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/utils.h"
-#ifndef __DARWIN__
-//  #include "extldef.h"
-#endif
 
 #if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
@@ -168,7 +166,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Size asize;
 
 
-    CreateListBoxControl( parent->GetMacRootWindow(), &bounds, false, 0, 1, false, true,
+    CreateListBoxControl( parent->MacGetRootWindow(), &bounds, false, 0, 1, false, true,
                           14, 14, false, &listDef, &m_macControl );
 
     GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,
@@ -180,7 +178,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 #else
     long    result ;
 
-    m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false ,
+    m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
     ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,
@@ -588,7 +586,7 @@ void wxListBox::SetupColours()
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
     // Set up port
-    WindowRef rootwindow = GetMacRootWindow() ;
+    WindowRef rootwindow = MacGetRootWindow() ;
     wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
     wxMacDrawingHelper focus( wxrootwindow );