X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41c9a21f8cc72250ee4b0d5230c5f529c0ab0aab..481fcc780da6b3ddbee3bd9f1eca5aafeef0a58b:/src/mac/listbox.cpp?ds=inline diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index 7cfcbc5bce..363d2245a9 100644 --- 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/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) @@ -164,6 +162,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, macListDefUPP = NewListDefUPP( wxMacListDefinition ); } listDef.u.userProc = macListDefUPP ; + #if TARGET_CARBON Size asize; @@ -178,6 +177,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, SetControlVisibility(m_macControl, false, false); #else + long result ; m_macControl = ::NewControl( parent->MacGetRootWindow() , &bounds , title , false , @@ -199,7 +199,6 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, Point pt = (**m_macList).cellSize ; pt.v = 14 ; LCellSize( pt , m_macList ) ; - LAddColumn( 1 , 0 , m_macList ) ; #endif OptionBits options = 0; @@ -587,12 +586,8 @@ void wxListBox::SetupColours() void wxListBox::Refresh(bool eraseBack, const wxRect *rect) { - // Set up port - WindowRef rootwindow = MacGetRootWindow() ; - wxWindow* wxrootwindow = wxFindWinFromMacWindow( rootwindow ) ; - wxMacDrawingHelper focus( wxrootwindow ); - - UMADrawControl(m_macControl); + wxControl::Refresh( eraseBack , rect ) ; +// MacRedrawControl() ; } #if wxUSE_OWNER_DRAWN