missing header file

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 35de39915c5470ee259b9accd6abe9bde51b2d3b..1a50bd9dc7701a31f60924664e83f7475997a00b 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -16,15 +16,12 @@
 #include "wx/listbox.h"
 
 #ifndef WX_PRECOMP
 #include "wx/listbox.h"
 
 #ifndef WX_PRECOMP

-    #include "wx/dynarray.h"

     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/intl.h"

-    #include "wx/app.h"

     #include "wx/utils.h"
     #include "wx/utils.h"

-    #include "wx/button.h"

     #include "wx/settings.h"
     #include "wx/arrstr.h"
     #include "wx/settings.h"
     #include "wx/arrstr.h"

-    #include "wx/toplevel.h"
+    #include "wx/dcclient.h"

 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)


@@ -33,7 +30,6 @@ BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"
 END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"

-#include "wx/dynarray.h"

 
 // ============================================================================
 // list box control implementation
 
 // ============================================================================
 // list box control implementation


@@ -93,7 +89,7 @@ bool wxListBox::Create(
     InsertItems( n, choices, 0 );
 
    // Needed because it is a wxControlWithItems
     InsertItems( n, choices, 0 );
 
    // Needed because it is a wxControlWithItems

-    SetBestSize( size );
+    SetInitialSize( size );

 
     return true;
 }
 
     return true;
 }


@@ -247,6 +243,9 @@ wxSize wxListBox::DoGetBestSize() const
     int wLine;
 
     {
     int wLine;
 
     {

+#if wxMAC_USE_CORE_GRAPHICS
+        wxClientDC dc(const_cast<wxListBox*>(this));
+#else

         wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
 
         // TODO: clean this up
         wxMacPortStateHelper st( UMAGetWindowPort( (WindowRef)MacGetTopLevelWindowRef() ) );
 
         // TODO: clean this up


@@ -262,12 +261,16 @@ wxSize wxListBox::DoGetBestSize() const
             ::TextSize( 9 );
             ::TextFace( 0 );
         }
             ::TextSize( 9 );
             ::TextFace( 0 );
         }

-
+#endif

         // Find the widest line
         for (unsigned int i = 0; i < GetCount(); i++)
         {
             wxString str( GetString( i ) );
         // Find the widest line
         for (unsigned int i = 0; i < GetCount(); i++)
         {
             wxString str( GetString( i ) );

-
+#if wxMAC_USE_CORE_GRAPHICS
+            wxCoord width, height ;
+            dc.GetTextExtent( str , &width, &height);
+            wLine = width ;
+#else

 #if wxUSE_UNICODE
             Point bounds = {0, 0};
             SInt16 baseline;
 #if wxUSE_UNICODE
             Point bounds = {0, 0};
             SInt16 baseline;


@@ -286,6 +289,7 @@ wxSize wxListBox::DoGetBestSize() const
 #endif
 
             lbWidth = wxMax( lbWidth, wLine );
 #endif
 
             lbWidth = wxMax( lbWidth, wLine );

+#endif

         }
 
         // Add room for the scrollbar
         }
 
         // Add room for the scrollbar


@@ -293,7 +297,13 @@ wxSize wxListBox::DoGetBestSize() const
 
         // And just a bit more
         int cy = 12;
 
         // And just a bit more
         int cy = 12;

+#if wxMAC_USE_CORE_GRAPHICS
+        wxCoord width, height ;
+        dc.GetTextExtent( wxT("X") , &width, &height);
+        int cx = width ;
+#else

         int cx = ::TextWidth( "X", 0, 1 );
         int cx = ::TextWidth( "X", 0, 1 );

+#endif

         lbWidth += cx;
 
         // don't make the listbox too tall (limit height to around 10 items)
         lbWidth += cx;
 
         // don't make the listbox too tall (limit height to around 10 items)