Blindly added wxImageList::replace( int, bitmap, mask )

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 388d93fefdee6e39f0a2d535225345a9f3a49e55..e52fea9d913527cc81627e9631def6c34314d382 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dirdlg.cpp
+// Name:        src/generic/dirdlg.cpp

 // Purpose:     wxDirDialog
 // Author:      Harm van der Heijden, Robert Roebling & Julian Smart
 // Modified by:
 // Purpose:     wxDirDialog
 // Author:      Harm van der Heijden, Robert Roebling & Julian Smart
 // Modified by:


@@ -9,20 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dirdlgg.h"
-#endif
-
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_DIRDLG
 
 #ifndef WX_PRECOMP
 #if wxUSE_DIRDLG
 
 #ifndef WX_PRECOMP


@@ -47,8 +40,6 @@
 
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;
 
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;

-static const int ID_OK = 1002;
-static const int ID_CANCEL = 1003;

 static const int ID_NEW = 1004;
 static const int ID_SHOW_HIDDEN = 1005;
 static const int ID_GO_HOME = 1006;
 static const int ID_NEW = 1004;
 static const int ID_SHOW_HIDDEN = 1005;
 static const int ID_GO_HOME = 1006;


@@ -88,7 +79,15 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
                                        const wxString& defaultPath, long style,
                                        const wxPoint& pos, const wxSize& sz,
                                        const wxString& name):
                                        const wxString& defaultPath, long style,
                                        const wxPoint& pos, const wxSize& sz,
                                        const wxString& name):

-                wxDialog(parent, ID_DIRCTRL, title, pos, sz, style, name)
+                wxDirDialogBase(parent, title, defaultPath, style, pos, sz, name)
+{
+    Create(parent, title, defaultPath, style, pos, sz, name);
+}
+
+bool wxGenericDirDialog::Create(wxWindow* parent, const wxString& title,
+                                       const wxString& defaultPath, long style,
+                                       const wxPoint& pos, const wxSize& sz,
+                                       const wxString& name)

 {
     wxBusyCursor cursor;
 
 {
     wxBusyCursor cursor;
 


@@ -100,7 +99,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
 

-    // smart phones does not support or do not waste space for wxButtons
+    // smartphones does not support or do not waste space for wxButtons

 #if defined(__SMARTPHONE__)
 
     wxMenu *dirMenu = new wxMenu;
 #if defined(__SMARTPHONE__)
 
     wxMenu *dirMenu = new wxMenu;


@@ -115,8 +114,6 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     dirMenu->AppendSeparator();
     dirMenu->Append(wxID_CANCEL, _("Cancel"));
 
     dirMenu->AppendSeparator();
     dirMenu->Append(wxID_CANCEL, _("Cancel"));
 

-    SetRightMenu(wxID_ANY, _("Options"), dirMenu);
-

 #else
 
     // 0) 'New' and 'Home' Buttons
 #else
 
     // 0) 'New' and 'Home' Buttons


@@ -152,7 +149,7 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 
     // 1) dir ctrl
 #endif // __SMARTPHONE__/!__SMARTPHONE__
 
     // 1) dir ctrl

-    m_dirCtrl = NULL; // this is neccessary, event handler called from
+    m_dirCtrl = NULL; // this is necessary, event handler called from

                       // wxGenericDirCtrl would crash otherwise!
     long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER;
 
                       // wxGenericDirCtrl would crash otherwise!
     long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER;
 


@@ -182,29 +179,34 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
     m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
     topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
 
     m_input = new wxTextCtrl( this, ID_TEXTCTRL, m_path, wxDefaultPosition );
     topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
 

-#ifndef __SMARTPHONE__
+    // 3) buttons if any
+    wxSizer *buttonSizer = CreateButtonSizer( wxOK|wxCANCEL , true, wxLARGESMALL(10,0) );
+    if(buttonSizer->GetChildren().GetCount() > 0 )
+    {
+        topsizer->Add( buttonSizer, 0, wxEXPAND | wxALL, wxLARGESMALL(10,0) );
+    }
+    else
+    {
+        topsizer->AddSpacer( wxLARGESMALL(10,0) );
+        delete buttonSizer;
+    }

 
 

-#if wxUSE_STATLINE
-    // 3) Static line
-    topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#ifdef __SMARTPHONE__
+    // overwrite menu achieved with earlier CreateButtonSizer() call
+    SetRightMenu(wxID_ANY, _("Options"), dirMenu);

 #endif
 
 #endif
 

-    // 4) Buttons
-    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxEXPAND | wxALL, 10 );
-
-#endif // !__SMARTPHONE__
-

     m_input->SetFocus();
 
     SetAutoLayout( true );
     SetSizer( topsizer );
 
     m_input->SetFocus();
 
     SetAutoLayout( true );
     SetSizer( topsizer );
 

-#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)

     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
     Centre( wxBOTH );

-#endif
+
+    return true;

 }
 
 void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 }
 
 void wxGenericDirDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))


@@ -279,7 +281,7 @@ void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
 
     if (data)
        m_input->SetValue( data->m_path );
 
     if (data)
        m_input->SetValue( data->m_path );

-};
+}

 
 void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
 {
 
 void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
 {


@@ -289,7 +291,7 @@ void wxGenericDirDialog::OnTreeKeyDown( wxTreeEvent &WXUNUSED(event) )
     wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
     if (data)
         m_input->SetValue( data->m_path );
     wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(m_dirCtrl->GetTreeCtrl()->GetSelection());
     if (data)
         m_input->SetValue( data->m_path );

-};
+}

 
 void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event )
 {
 
 void wxGenericDirDialog::OnShowHidden( wxCommandEvent& event )
 {