X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/489468feaa08b8f504735eecca522fb8d0f825d2..ef6ece2352e739f843d9fc08d96d46b6467b83d6:/src/osx/carbon/listbox.cpp

diff --git a/src/osx/carbon/listbox.cpp b/src/osx/carbon/listbox.cpp
index 8c479b1066..5e63f1cf8a 100644
--- a/src/osx/carbon/listbox.cpp
+++ b/src/osx/carbon/listbox.cpp
@@ -29,7 +29,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
 BEGIN_EVENT_TABLE(wxListBox, wxControl)
 END_EVENT_TABLE()
 
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 
 // ============================================================================
 // list box control implementation
@@ -426,7 +426,7 @@ void wxMacListBoxItem::Notification(wxMacDataItemBrowserControl *owner ,
         return;
     }
 
-    wxListBox *list = wxDynamicCast( owner->GetPeer() , wxListBox );
+    wxListBox *list = wxDynamicCast( owner->GetWXPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));
 
     if (message == kDataBrowserItemDoubleClicked)
@@ -535,7 +535,7 @@ void wxMacDataBrowserListControl::ItemNotification(
                         DataBrowserItemNotification message,
                         DataBrowserItemDataRef itemData)
 {
-    wxListBox *list = wxDynamicCast( GetPeer() , wxListBox );
+    wxListBox *list = wxDynamicCast( GetWXPeer() , wxListBox );
     wxCHECK_RET( list != NULL , wxT("Listbox expected"));
     
     if (list->HasMultipleSelection() && (message == kDataBrowserSelectionSetChanged) && (!list->MacGetBlockEvents()))
@@ -549,7 +549,7 @@ void wxMacDataBrowserListControl::ItemNotification(
         wxCommandEvent event( wxEVT_COMMAND_LISTBOX_SELECTED, list->GetId() );
         
         int sel = list->GetSelection();
-        if ((sel < 0) || (sel > list->GetCount()))  // OS X can select an item below the last item (why?)
+        if ((sel < 0) || (sel > (int) list->GetCount()))  // OS X can select an item below the last item (why?)
            return;
         event.SetEventObject( list );
         if ( list->HasClientObjectData() )
@@ -566,12 +566,12 @@ void wxMacDataBrowserListControl::ItemNotification(
     // call super for item level(wxMacDataItem->Notification) callback processing
     wxMacDataItemBrowserControl::ItemNotification( itemID, message, itemData);
 }
-
+/*
 wxWindow * wxMacDataBrowserListControl::GetPeer() const
 {
-    return wxDynamicCast( wxMacControl::GetPeer() , wxWindow );
+    return wxDynamicCast( wxMacControl::GetWX() , wxWindow );
 }
-
+*/
 wxMacDataItem* wxMacDataBrowserListControl::CreateItem()
 {
     return new wxMacListBoxItem();