don't make wxBitmapButtons same size as all the other buttons

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

diff --git a/src/mac/carbon/dirdlg.cpp b/src/mac/carbon/dirdlg.cpp
index e1255db7e1194af75eb32862a22db93565cbcd27..83533f1236711365c82828ecadfabb3b500e8d2c 100644 (file)
--- a/src/mac/carbon/dirdlg.cpp
+++ b/src/mac/carbon/dirdlg.cpp
@@ -20,8 +20,8 @@
 
 #include "wx/cmndata.h"
 
-#if defined(__UNIX__)
-  #include <NavigationServices/Navigation.h>
+#ifdef __DARWIN__
+  #include <Carbon/Carbon.h>
 #else
   #include <Navigation.h>
 #endif
@@ -182,7 +182,7 @@ static Boolean SameFSSpec(FSSpecPtr spec1, FSSpecPtr spec2)
 // flashing of the button when the key is hit
 
 static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRecord *eventRec,
-                                                                                       short *item, Ptr dataPtr)
+                                                                                       short *item, void *dataPtr)
 {
 #pragma unused (dataPtr)
 
@@ -210,7 +210,7 @@ static pascal Boolean SFGetFolderModalDialogFilter(DialogPtr theDlgPtr, EventRec
 // MyDlgHook is a hook routine that maps the select button to Open
 // and sets the Select button name
 
-static pascal short SFGetFolderDialogHook(short item, DialogPtr theDlgPtr, Ptr dataPtr)
+static pascal short SFGetFolderDialogHook(short item, DialogPtr theDlgPtr, void *dataPtr)
 {
        UserDataRecPtr  theUserDataRecPtr;
        long                    desktopDirID;
@@ -422,7 +422,7 @@ void StandardGetFolder( ConstStr255Param message , ConstStr255Param path , FileF
        }
 }
 
-static pascal Boolean OnlyVisibleFoldersCustomFileFilter(CInfoPBPtr myCInfoPBPtr, Ptr dataPtr)
+static pascal Boolean OnlyVisibleFoldersCustomFileFilter(CInfoPBPtr myCInfoPBPtr, void *dataPtr)
 {
 #pragma unused (dataPtr)
 
@@ -492,7 +492,7 @@ int wxDirDialog::ShowModal()
                }
                else
                {
-                       m_path = wxMacFSSpec2UnixFilename( &reply.sfFile ) ;
+                       m_path = wxMacFSSpec2MacFilename( &reply.sfFile ) ;
                        return wxID_OK ;
                }
                return wxID_CANCEL;
@@ -589,7 +589,7 @@ int wxDirDialog::ShowModal()
                                                   name, &outFileSpec);
                                                        
                        // outFolderDirID = thePB.dirInfo.ioDrDirID;
-                       m_path = wxMacFSSpec2UnixFilename( &outFileSpec ) ;
+                       m_path = wxMacFSSpec2MacFilename( &outFileSpec ) ;
                        return wxID_OK ;
                }
                return wxID_CANCEL;