made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 66e3c72b577b4344027fc075780e9c310d2abd2a..144cdee7963c5cf78b7710f47f71bbf7fae77562 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -20,7 +20,7 @@
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 
 #include "wx/filedlg.h"
 #include "wx/intl.h"
 

-#if !defined(__UNIX__)
+#ifndef __DARWIN__

   #include "PLStringFuncs.h"
 #endif
 
   #include "PLStringFuncs.h"
 #endif
 


@@ -30,13 +30,11 @@ IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 
 // begin wxmac
 
 
 // begin wxmac
 

-#if defined(__UNIX__)
-  #include <Carbon/Carbon.h>
-#else
+#ifndef __DARWIN__

   #include <Navigation.h>
 #endif
 
   #include <Navigation.h>
 #endif
 

-#ifndef __UNIX__
+#ifndef __DARWIN__

   #include "morefile.h"
   #include "moreextr.h"
   #include "fullpath.h"
   #include "morefile.h"
   #include "moreextr.h"
   #include "fullpath.h"


@@ -546,7 +544,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 }
 
 
 }
 
 

-Boolean CrossPlatformFilterCallback (
+pascal Boolean CrossPlatformFilterCallback (

     AEDesc *theItem, 
     void *info, 
     void *callBackUD, 
     AEDesc *theItem, 
     void *info, 
     void *callBackUD, 


@@ -751,7 +749,7 @@ int wxFileDialog::ShowModal()
                  }
                }
 
                  }
                }
 

-      mNavFilterUPP = NewNavObjectFilterProc( CrossPlatformFilterCallback ) ;
+      mNavFilterUPP = NewNavObjectFilterUPP( CrossPlatformFilterCallback ) ;

                        if ( m_dialogStyle & wxMULTIPLE )
                                mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
                        else
                        if ( m_dialogStyle & wxMULTIPLE )
                                mNavOptions.dialogOptionFlags |= kNavAllowMultipleFiles ;
                        else