fixed typo

[wxWidgets.git] / src / generic / dirdlgg.cpp

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index fd25e7b71c7b89b3105d69b5f79fd8e5fb510388..77b39ff58fc47c0dd76fa6215a72e7dce47d18f9 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -89,7 +89,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 #ifndef __DOS__
     wxBitmapButton* homeButton =
         new wxBitmapButton(this, ID_GO_HOME,
 #ifndef __DOS__
     wxBitmapButton* homeButton =
         new wxBitmapButton(this, ID_GO_HOME,

-                           wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_CMN_DIALOG));
+                           wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));

     buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 );
 #endif
 
     buttonsizer->Add( homeButton, 0, wxLEFT|wxRIGHT, 10 );
 #endif
 


@@ -99,7 +99,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     {
         wxBitmapButton* newButton =
             new wxBitmapButton(this, ID_NEW,
     {
         wxBitmapButton* newButton =
             new wxBitmapButton(this, ID_NEW,

-                            wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
+                            wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_BUTTON));

         buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
 #if wxUSE_TOOLTIPS
         newButton->SetToolTip(_("Create new directory"));
         buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
 #if wxUSE_TOOLTIPS
         newButton->SetToolTip(_("Create new directory"));


@@ -127,7 +127,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 #endif
 
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
 #endif
 
     m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,

-                                     m_path, wxPoint(5, 5),
+                                     m_path, wxDefaultPosition,

                                      wxSize(300, 200),
                                      dirStyle);
 
                                      wxSize(300, 200),
                                      dirStyle);
 


@@ -135,7 +135,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 
     // Make the an option depending on a flag?
     wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );
 
     // Make the an option depending on a flag?
     wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );

-    topsizer->Add( check, 0, wxLEFT|wxTOP | wxALIGN_RIGHT, 5 );
+    topsizer->Add( check, 0, wxLEFT|wxRIGHT|wxTOP | wxALIGN_RIGHT, 10 );

 
     // 2) text ctrl
     m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
 
     // 2) text ctrl
     m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );


@@ -150,12 +150,12 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
     // OK and Cancel button should be at the right bottom
     buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
     // OK and Cancel button should be at the right bottom

-    wxButton* okButton = new wxButton(this, wxID_OK, _("OK"));
+    wxButton* okButton = new wxButton(this, wxID_OK, wxSTOCK_OK);

     buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );
     buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );

-    wxButton* cancelButton = new wxButton(this, wxID_CANCEL, _("Cancel"));
+    wxButton* cancelButton = new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL);

     buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
 
     buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
 

-    topsizer->Add( buttonsizer, 0, wxALL | wxALIGN_RIGHT, 10 );
+    topsizer->Add( buttonsizer, 0, wxLEFT|wxTOP|wxBOTTOM | wxALIGN_RIGHT, 10 );

 
     okButton->SetDefault();
     m_dirCtrl->SetFocus();
 
     okButton->SetDefault();
     m_dirCtrl->SetFocus();