Include wx/menuitem.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp
index 3d6eac95daaecba9e9f15dcbe3d2a6e99b1e768d..5a0858ee35e58b7a9ce7ed322a9dce844f2a69cf 100644 (file)
--- a/src/mac/carbon/listbox.cpp
+++ b/src/mac/carbon/listbox.cpp
@@ -13,19 +13,20 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#include "wx/listbox.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"

+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/arrstr.h"
+    #include "wx/toplevel.h"

 #endif
 
 #endif
 

-#include "wx/app.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/settings.h"
-#include "wx/toplevel.h"
-#include "wx/log.h"
-
-#include "wx/utils.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
 
 BEGIN_EVENT_TABLE(wxListBox, wxControl)


@@ -33,7 +34,6 @@ END_EVENT_TABLE()
 
 #include "wx/mac/uma.h"
 #include "wx/dynarray.h"
 
 #include "wx/mac/uma.h"
 #include "wx/dynarray.h"

-#include "wx/arrstr.h"

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


@@ -515,7 +515,6 @@ OSStatus wxMacListBoxItem::GetSetData( wxMacDataItemBrowserControl *owner ,
     OSStatus err = errDataBrowserPropertyNotSupported;
     wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
     wxCHECK_MSG( list != NULL , errDataBrowserPropertyNotSupported , wxT("Listbox expected"));
     OSStatus err = errDataBrowserPropertyNotSupported;
     wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
     wxCHECK_MSG( list != NULL , errDataBrowserPropertyNotSupported , wxT("Listbox expected"));

-    wxCheckListBox *checklist = wxDynamicCast( list , wxCheckListBox );

 
     if ( !changeValue )
     {
 
     if ( !changeValue )
     {


@@ -717,7 +716,7 @@ void wxMacDataBrowserListControl::SetClientDataType(wxClientDataType clientDataI
 
 unsigned int wxMacDataBrowserListControl::MacGetCount() const
 {
 
 unsigned int wxMacDataBrowserListControl::MacGetCount() const
 {

-    return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemNoState);
+    return GetItemCount(wxMacDataBrowserRootContainer,false,kDataBrowserItemAnyState);

 }
 
 void wxMacDataBrowserListControl::MacDelete( unsigned int n )
 }
 
 void wxMacDataBrowserListControl::MacDelete( unsigned int n )


@@ -957,4 +956,4 @@ static pascal void ListBoxDrawProc(
 #endif
 
 
 #endif
 
 

-#endif
+#endif // wxUSE_LISTBOX