compilation fix for wxUSE_DYNLOAD

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

diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp
index ffbe8e70358ce8c5e161d65fd4edbe8844b9fd69..363d2245a9caa824e222831ef8e508053153c099 100644 (file)
--- a/src/mac/listbox.cpp
+++ b/src/mac/listbox.cpp
@@ -16,13 +16,11 @@
 #include "wx/app.h"
 #include "wx/listbox.h"
 #include "wx/settings.h"
 #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"
 #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)
 
 #if !USE_SHARED_LIBRARY
   IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)


@@ -164,11 +162,12 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
       macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
     }
         listDef.u.userProc = macListDefUPP ;
       macListDefUPP = NewListDefUPP( wxMacListDefinition ); 
     }
         listDef.u.userProc = macListDefUPP ;

+

 #if TARGET_CARBON
     Size asize;
 
 
 #if TARGET_CARBON
     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,
                           14, 14, false, &listDef, &m_macControl );
 
     GetControlData(m_macControl, kControlNoPart, kControlListBoxListHandleTag,


@@ -178,9 +177,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     SetControlVisibility(m_macControl, false, false);
 
 #else
     SetControlVisibility(m_macControl, false, false);
 
 #else

+

     long    result ;
 
     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 ,
                   kwxMacListWithVerticalScrollbar , 0 , 0, 
                   kControlListBoxProc , (long) this ) ;
     ::GetControlData( m_macControl , kControlNoPart , kControlListBoxListHandleTag ,


@@ -199,7 +199,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     Point pt = (**m_macList).cellSize ;
     pt.v = 14 ;
     LCellSize( pt , m_macList ) ;
     Point pt = (**m_macList).cellSize ;
     pt.v = 14 ;
     LCellSize( pt , m_macList ) ;

-    

     LAddColumn( 1 , 0 , m_macList ) ;
 #endif
     OptionBits  options = 0;
     LAddColumn( 1 , 0 , m_macList ) ;
 #endif
     OptionBits  options = 0;


@@ -587,12 +586,8 @@ void wxListBox::SetupColours()
 
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {
 
 void wxListBox::Refresh(bool eraseBack, const wxRect *rect)
 {

-    // Set up port
-    WindowRef rootwindow = GetMacRootWindow() ;
-    wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ;
-    wxMacDrawingHelper focus( wxrootwindow );
-
-    UMADrawControl(m_macControl);
+    wxControl::Refresh( eraseBack , rect ) ;
+//    MacRedrawControl() ;

 }
 
 #if wxUSE_OWNER_DRAWN
 }
 
 #if wxUSE_OWNER_DRAWN