bitmap button size was too small when uxtheme functions were used to get the margins

[wxWidgets.git] / src / common / filepickercmn.cpp

diff --git a/src/common/filepickercmn.cpp b/src/common/filepickercmn.cpp
index ddd28f6c941e17575f247a7853c3345d0e51d2a6..3591e7d6544b1cef281709321ce649ce592a6b93 100644 (file)
--- a/src/common/filepickercmn.cpp
+++ b/src/common/filepickercmn.cpp
@@ -28,6 +28,10 @@
 
 #include "wx/filepicker.h"
 
 
 #include "wx/filepicker.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -55,6 +59,19 @@ bool wxFileDirPickerCtrlBase::CreateBase( wxWindow *parent, wxWindowID id,
                                    style, validator, name))
         return false;
 
                                    style, validator, name))
         return false;
 

+    if (!HasFlag(wxFLP_OPEN) && !HasFlag(wxFLP_SAVE))
+        m_windowStyle |= wxFLP_OPEN;     // wxFD_OPEN is the default
+
+    // check that the styles are not contradictory
+    wxASSERT_MSG( !(HasFlag(wxFLP_SAVE) && HasFlag(wxFLP_OPEN)),
+                  _T("can't specify both wxFLP_SAVE and wxFLP_OPEN at once") );
+
+    wxASSERT_MSG( !HasFlag(wxFLP_SAVE) || !HasFlag(wxFLP_FILE_MUST_EXIST),
+                   _T("wxFLP_FILE_MUST_EXIST can't be used with wxFLP_SAVE" ) );
+
+    wxASSERT_MSG( !HasFlag(wxFLP_OPEN) || !HasFlag(wxFLP_OVERWRITE_PROMPT),
+                  _T("wxFLP_OVERWRITE_PROMPT can't be used with wxFLP_OPEN") );
+

     // create a wxFilePickerWidget or a wxDirPickerWidget...
     if (!CreatePicker(this, path, message, wildcard))
         return false;
     // create a wxFilePickerWidget or a wxDirPickerWidget...
     if (!CreatePicker(this, path, message, wildcard))
         return false;