Incomplete setup build fix.

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index 77b39ff58fc47c0dd76fa6215a72e7dce47d18f9..124e7ae05530fd7b032a5e06fd81ed253414a072 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -41,11 +41,9 @@
 #include "wx/artprov.h"
 #include "wx/bmpbuttn.h"
 
 #include "wx/artprov.h"
 #include "wx/bmpbuttn.h"
 

-//-----------------------------------------------------------------------------
-// wxGenericDirDialog
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog)
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;
 
 static const int ID_DIRCTRL = 1000;
 static const int ID_TEXTCTRL = 1001;


@@ -55,6 +53,26 @@ static const int ID_NEW = 1004;
 static const int ID_SHOW_HIDDEN = 1005;
 static const int ID_GO_HOME = 1006;
 
 static const int ID_SHOW_HIDDEN = 1005;
 static const int ID_GO_HOME = 1006;
 

+// ---------------------------------------------------------------------------
+// macros
+// ---------------------------------------------------------------------------
+
+/* Macro for avoiding #ifdefs when value have to be different depending on size of
+   device we display on - take it from something like wxDesktopPolicy in the future
+ */
+
+#if defined(__SMARTPHONE__)
+    #define wxLARGESMALL(large,small) small
+#else
+    #define wxLARGESMALL(large,small) large
+#endif
+
+//-----------------------------------------------------------------------------
+// wxGenericDirDialog
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGenericDirDialog, wxDialog)
+

 BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
     EVT_CLOSE                (wxGenericDirDialog::OnCloseWindow)
     EVT_BUTTON               (wxID_OK,        wxGenericDirDialog::OnOK)
 BEGIN_EVENT_TABLE(wxGenericDirDialog, wxDialog)
     EVT_CLOSE                (wxGenericDirDialog::OnCloseWindow)
     EVT_BUTTON               (wxID_OK,        wxGenericDirDialog::OnOK)


@@ -82,11 +100,30 @@ 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
+#if defined(__SMARTPHONE__)
+
+    wxMenu *dirMenu = new wxMenu;
+    dirMenu->Append(ID_GO_HOME, _("Home"));
+
+    if (style & wxDD_NEW_DIR_BUTTON)
+    {
+        dirMenu->Append(ID_NEW, _("New directory"));
+    }
+
+    dirMenu->AppendCheckItem(ID_SHOW_HIDDEN, _("Show hidden directories"));
+    dirMenu->AppendSeparator();
+    dirMenu->Append(wxID_CANCEL, _("Cancel"));
+
+    SetRightMenu(wxID_ANY, _("Options"), dirMenu);
+
+#else
+

     // 0) 'New' and 'Home' Buttons
     wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
     // VS: 'Home directory' concept is unknown to MS-DOS
     // 0) 'New' and 'Home' Buttons
     wxSizer* buttonsizer = new wxBoxSizer( wxHORIZONTAL );
 
     // VS: 'Home directory' concept is unknown to MS-DOS

-#ifndef __DOS__
+#if !defined(__DOS__)

     wxBitmapButton* homeButton =
         new wxBitmapButton(this, ID_GO_HOME,
                            wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));
     wxBitmapButton* homeButton =
         new wxBitmapButton(this, ID_GO_HOME,
                            wxArtProvider::GetBitmap(wxART_GO_HOME, wxART_BUTTON));


@@ -112,10 +149,12 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 
     topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
 
 
     topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
 

+#endif // __SMARTPHONE__/!__SMARTPHONE__
+

     // 1) dir ctrl
     m_dirCtrl = NULL; // this is neccessary, event handler called from
                       // wxGenericDirCtrl would crash otherwise!
     // 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)
 
 #ifdef __WXMSW__
     if (style & wxDD_NEW_DIR_BUTTON)


@@ -131,15 +170,19 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
                                      wxSize(300, 200),
                                      dirStyle);
 
                                      wxSize(300, 200),
                                      dirStyle);
 

-    topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
+    topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );

 
 

+#ifndef __SMARTPHONE__

     // Make the an option depending on a flag?
     wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );
     topsizer->Add( check, 0, wxLEFT|wxRIGHT|wxTOP | wxALIGN_RIGHT, 10 );
     // Make the an option depending on a flag?
     wxCheckBox* check = new wxCheckBox( this, ID_SHOW_HIDDEN, _("Show hidden directories") );
     topsizer->Add( check, 0, wxLEFT|wxRIGHT|wxTOP | wxALIGN_RIGHT, 10 );

+#endif // !__SMARTPHONE__

 
     // 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 );

-    topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );
+    topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
+
+#ifndef __SMARTPHONE__

 
 #if wxUSE_STATLINE
     // 3) Static line
 
 #if wxUSE_STATLINE
     // 3) Static line


@@ -147,26 +190,21 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
 #endif
 
     // 4) Buttons
 #endif
 
     // 4) Buttons

-    buttonsizer = new wxBoxSizer( wxHORIZONTAL );
+    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxEXPAND | wxALL, 10 );

 
 

-    // OK and Cancel button should be at the right bottom
-    wxButton* okButton = new wxButton(this, wxID_OK, wxSTOCK_OK);
-    buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 );
-    wxButton* cancelButton = new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL);
-    buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 );
+#endif // !__SMARTPHONE__

 
 

-    topsizer->Add( buttonsizer, 0, wxLEFT|wxTOP|wxBOTTOM | wxALIGN_RIGHT, 10 );
-
-    okButton->SetDefault();
-    m_dirCtrl->SetFocus();
+    m_input->SetFocus();

 
     SetAutoLayout( true );
     SetSizer( topsizer );
 
 
     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

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


@@ -232,7 +270,13 @@ void wxGenericDirDialog::OnTreeSelected( wxTreeEvent &event )
     if (!m_dirCtrl)
         return;
 
     if (!m_dirCtrl)
         return;
 

-    wxDirItemData *data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(event.GetItem());
+    wxTreeItemId item = event.GetItem();
+
+    wxDirItemData *data = NULL;
+
+    if(item.IsOk())
+        data = (wxDirItemData*)m_dirCtrl->GetTreeCtrl()->GetItemData(item);
+

     if (data)
        m_input->SetValue( data->m_path );
 };
     if (data)
        m_input->SetValue( data->m_path );
 };


@@ -276,7 +320,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
     if (!wxEndsWithPathSeparator(path))
         path += wxFILE_SEP_PATH;
     path += new_name;
     if (!wxEndsWithPathSeparator(path))
         path += wxFILE_SEP_PATH;
     path += new_name;

-    if (wxFileExists(path))
+    if (wxPathExists(path))

     {
         // try NewName0, NewName1 etc.
         int i = 0;
     {
         // try NewName0, NewName1 etc.
         int i = 0;


@@ -291,7 +335,7 @@ void wxGenericDirDialog::OnNew( wxCommandEvent& WXUNUSED(event) )
                 path += wxFILE_SEP_PATH;
             path += new_name;
             i++;
                 path += wxFILE_SEP_PATH;
             path += new_name;
             i++;

-        } while (wxFileExists(path));
+        } while (wxPathExists(path));

     }
 
     wxLogNull log;
     }
 
     wxLogNull log;