remove unneeded DoGetClientSize

[wxWidgets.git] / include / wx / dirdlg.h

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index e8c7e441001099a45bcd4943b0f871da71d06806..9a7477102baab70b0a4109fe3f620be5cb038d03 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -24,13 +24,16 @@ extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogNameStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 
 extern WXDLLEXPORT_DATA(const wxChar) wxDirDialogDefaultFolderStr[];
 extern WXDLLEXPORT_DATA(const wxChar) wxDirSelectorPromptStr[];
 

+#define wxDD_CHANGE_DIR         0x0100
+#define wxDD_DIR_MUST_EXIST     0x0200
+
+// deprecated, on by default now, use wxDD_DIR_MUST_EXIST to disable it
+#define wxDD_NEW_DIR_BUTTON     0

 
 #ifdef __WXWINCE__
 
 #ifdef __WXWINCE__

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      wxDEFAULT_DIALOG_STYLE

 #else
 #else

-    #define wxDD_DEFAULT_STYLE \
-        (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDD_NEW_DIR_BUTTON)
+    #define wxDD_DEFAULT_STYLE      (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)

 #endif
 
 //-------------------------------------------------------------------------
 #endif
 
 //-------------------------------------------------------------------------


@@ -85,59 +88,34 @@ protected:
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXUNIVERSAL__)
 
 // Universal and non-port related switches with need for generic implementation
 #if defined(__WXUNIVERSAL__)

-

     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog

-

 #elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
                              !wxUSE_OLE               || \
                              (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
 #elif defined(__WXMSW__) && (defined(__SALFORDC__)    || \
                              !wxUSE_OLE               || \
                              (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))

-

     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog

-
-// MS PocketPC or MS Smartphone

 #elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)
 #elif defined(__WXMSW__) && defined(__WXWINCE__) && !defined(__HANDHELDPC__)

-
-    #include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"     // MS PocketPC or MS Smartphone

     #define wxDirDialog wxGenericDirDialog
     #define wxDirDialog wxGenericDirDialog

-
-// Native MSW

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-
-    #include "wx/msw/dirdlg.h"
-
-// Native GTK for gtk2.x and generic for gtk1.x
+    #include "wx/msw/dirdlg.h"  // Native MSW
+#elif defined(__WXGTK24__)
+    #include "wx/gtk/dirdlg.h"  // Native GTK for gtk2.4

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

-
-#if defined( __WXGTK20__ )
-    #include "wx/gtk/dirdlg.h"
-    #define wxDirDialog wxDirDialogGTK
-#else

     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog

-#endif
-
-// Native Mac

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-
-    #include "wx/mac/dirdlg.h"
-
-// Native Cocoa
+    #include "wx/mac/dirdlg.h"      // Native Mac

 #elif defined(__WXCOCOA__)
 #elif defined(__WXCOCOA__)

-
-    #include "wx/cocoa/dirdlg.h"
-
-// Other ports use generic implementation
+    #include "wx/cocoa/dirdlg.h"    // Native Cocoa

 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \
       defined(__WXPM__)
 #elif defined(__WXMOTIF__) || \
       defined(__WXX11__)   || \
       defined(__WXMGL__)   || \
       defined(__WXCOCOA__) || \
       defined(__WXPM__)

-
-    #include "wx/generic/dirdlgg.h"
+    #include "wx/generic/dirdlgg.h"     // Other ports use generic implementation

     #define wxDirDialog wxGenericDirDialog
     #define wxDirDialog wxGenericDirDialog

-

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------