X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acf2ac3757581e8d272d2bdb427a4fc0bbed4cf7..209f3e1453dd576919bf1cc8f696218dae23c34b:/src/generic/dirdlgg.cpp?ds=inline diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index 327bcbc81e..388d93fefd 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -154,7 +154,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, // 1) dir ctrl m_dirCtrl = NULL; // this is neccessary, event handler called from // wxGenericDirCtrl would crash otherwise! - long dirStyle = wxDIRCTRL_DIR_ONLY|wxSUNKEN_BORDER; + long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER; #ifdef __WXMSW__ if (style & wxDD_NEW_DIR_BUTTON) @@ -199,10 +199,12 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, SetAutoLayout( true ); SetSizer( topsizer ); +#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__) topsizer->SetSizeHints( this ); topsizer->Fit( this ); Centre( wxBOTH ); +#endif } void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) @@ -214,7 +216,7 @@ void wxGenericDirDialog::OnOK(wxCommandEvent& WXUNUSED(event)) { m_path = m_input->GetValue(); // Does the path exist? (User may have typed anything in m_input) - if (wxPathExists(m_path)) { + if (wxDirExists(m_path)) { // OK, path exists, we're done. EndModal(wxID_OK); return; @@ -318,7 +320,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) if (!wxEndsWithPathSeparator(path)) path += wxFILE_SEP_PATH; path += new_name; - if (wxFileExists(path)) + if (wxDirExists(path)) { // try NewName0, NewName1 etc. int i = 0; @@ -333,7 +335,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) ) path += wxFILE_SEP_PATH; path += new_name; i++; - } while (wxFileExists(path)); + } while (wxDirExists(path)); } wxLogNull log;