Correct IsMaximized() in wxOSX for non-resizable windows.

[wxWidgets.git] / src / osx / cocoa / dataview.mm

diff --git a/src/osx/cocoa/dataview.mm b/src/osx/cocoa/dataview.mm
index bff2560e350192ce2876e7767d65c3e90e0b93a1..be4074a36e004b33f7b43b4d08f0618697c7ae43 100644 (file)
--- a/src/osx/cocoa/dataview.mm
+++ b/src/osx/cocoa/dataview.mm
@@ -21,8 +21,8 @@
     #include "wx/utils.h"
 #endif
 
     #include "wx/utils.h"
 #endif
 

-#include "wx/osx/cocoa/dataview.h"

 #include "wx/osx/private.h"
 #include "wx/osx/private.h"

+#include "wx/osx/cocoa/dataview.h"

 #include "wx/renderer.h"
 
 // ============================================================================
 #include "wx/renderer.h"
 
 // ============================================================================


@@ -603,6 +603,7 @@ outlineView:(NSOutlineView*)outlineView
         ::CFRelease(osxData);
         delete dataObjects;
     }
         ::CFRelease(osxData);
         delete dataObjects;
     }

+    return dragSuccessful;

 }
 
 -(id) outlineView:(NSOutlineView*)outlineView
 }
 
 -(id) outlineView:(NSOutlineView*)outlineView


@@ -705,7 +706,7 @@ outlineView:(NSOutlineView*)outlineView
             sortingColumnPtr:dvc->GetColumn([[newDescriptor key] intValue])
             ascending:[newDescriptor ascending]] autorelease]];
     }
             sortingColumnPtr:dvc->GetColumn([[newDescriptor key] intValue])
             ascending:[newDescriptor ascending]] autorelease]];
     }

-    [[outlineView dataSource] setSortDescriptors:wxSortDescriptors];
+    [(wxCocoaOutlineDataSource*)[outlineView dataSource] setSortDescriptors:wxSortDescriptors];

 
     // send first the event to wxWidgets that the sorting has changed so that
     // the program can do special actions before the sorting actually starts:
 
     // send first the event to wxWidgets that the sorting has changed so that
     // the program can do special actions before the sorting actually starts:


@@ -1751,7 +1752,8 @@ outlineView:(NSOutlineView*)outlineView
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
 
     event.SetEventObject(dvc);
     wxDataViewEvent event(wxEVT_COMMAND_DATAVIEW_SELECTION_CHANGED,dvc->GetId());
 
     event.SetEventObject(dvc);

-    event.SetModel      (dvc->GetModel());
+    event.SetModel(dvc->GetModel());
+    event.SetItem(dvc->GetSelection());

     dvc->GetEventHandler()->ProcessEvent(event);
 }
 
     dvc->GetEventHandler()->ProcessEvent(event);
 }