avoid deferred show with Fluxbox, its support for _NET_REQUEST_FRAME_EXTENTS is broken

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

diff --git a/src/osx/cocoa/dirdlg.mm b/src/osx/cocoa/dirdlg.mm
index 4f5063ba61a8e607a2644a91fff40752083a5c77..9baab201ae0cfedb2888e407bb438374c71df973 100644 (file)
--- a/src/osx/cocoa/dirdlg.mm
+++ b/src/osx/cocoa/dirdlg.mm
@@ -1,8 +1,8 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/dirdlg.mm
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/dirdlg.mm

-// Purpose:     wxDirDialog  
+// Purpose:     wxDirDialog

 // Author:      Stefan Csomor
 // Author:      Stefan Csomor

-// Modified by: 
+// Modified by:

 // Created:     2008-08-30
 // RCS-ID:      $Id: dirdlg.mm 40007 2006-07-05 13:10:46Z SC $
 // Copyright:   (c) Stefan Csomor
 // Created:     2008-08-30
 // RCS-ID:      $Id: dirdlg.mm 40007 2006-07-05 13:10:46Z SC $
 // Copyright:   (c) Stefan Csomor


@@ -37,8 +37,8 @@
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
 wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,

-        const wxString& defaultPath, long style, const wxPoint& pos,
-        const wxSize& size, const wxString& name)
+        const wxString& defaultPath, long style, const wxPoint& WXUNUSED(pos),
+        const wxSize& WXUNUSED(size), const wxString& WXUNUSED(name))

 {
     m_parent = parent;
 
 {
     m_parent = parent;
 


@@ -51,26 +51,26 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
 int wxDirDialog::ShowModal()
 {
     int result = wxID_CANCEL;
 int wxDirDialog::ShowModal()
 {
     int result = wxID_CANCEL;

-    
+

     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
     [oPanel setCanChooseFiles:NO];
     NSOpenPanel *oPanel = [NSOpenPanel openPanel];
     [oPanel setCanChooseDirectories:YES];
     [oPanel setResolvesAliases:YES];
     [oPanel setCanChooseFiles:NO];

-    
+

     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];
     wxCFStringRef cf( m_message );
     [oPanel setMessage:cf.AsNSString()];

- 
-    if ( HasFlag(wxDD_NEW_DIR_BUTTON) ) 
+
+    if ( HasFlag(wxDD_NEW_DIR_BUTTON) )

         [oPanel setCanCreateDirectories:YES];
 
     wxCFStringRef dir( m_path );
         [oPanel setCanCreateDirectories:YES];
 
     wxCFStringRef dir( m_path );

-    
+

     m_path = wxEmptyString;
 
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;
     m_path = wxEmptyString;
 
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;

-    
-    if (GetParent()) 
+
+    if (GetParent())

     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }
     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }


@@ -78,28 +78,28 @@ int wxDirDialog::ShowModal()
     {
         fprintf(stderr, "No parent!\n");
     }
     {
         fprintf(stderr, "No parent!\n");
     }

-    
+
+/*

     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();
     if (parentWindow)
     {
         NSWindow* nativeParent = parentWindow->GetWXWindow();

-        ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-        [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil 
-            modalForWindow: nativeParent modalDelegate: sheetDelegate 
-            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+        ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+        [oPanel beginSheetForDirectory:dir.AsNSString() file:nil types: nil
+            modalForWindow: nativeParent modalDelegate: sheetDelegate
+            didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

             contextInfo: nil];
         [sheetDelegate waitForSheetToFinish];
         returnCode = [sheetDelegate code];
         [sheetDelegate release];
     }
     else
             contextInfo: nil];
         [sheetDelegate waitForSheetToFinish];
         returnCode = [sheetDelegate code];
         [sheetDelegate release];
     }
     else

+*/

     {
         returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];
     }
     if (returnCode == NSOKButton )
     {
     {
         returnCode = (NSInteger)[oPanel runModalForDirectory:dir.AsNSString() file:nil types:nil];
     }
     if (returnCode == NSOKButton )
     {

-        wxCFStringRef resultpath( [[[oPanel filenames] objectAtIndex:0] retain] );
-        
-        SetPath( resultpath.AsString() );
+        SetPath( wxCFStringRef::AsString([[oPanel filenames] objectAtIndex:0]));

         result = wxID_OK;
     }
     return result;
         result = wxID_OK;
     }
     return result;