Ensure there is valid context for DrawRectangle

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

diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index aaa37122932747b2e0415ce8dafe16e704b8c134..14cf31b5a0bf257f335bbb5ea7cacef11226b0c4 100644 (file)
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/generic/dirdlg.cpp
+// Name:        src/generic/dirdlgg.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:


@@ -33,6 +33,7 @@
 #include "wx/dirctrl.h"
 #include "wx/generic/dirdlgg.h"
 #include "wx/artprov.h"
 #include "wx/dirctrl.h"
 #include "wx/generic/dirdlgg.h"
 #include "wx/artprov.h"

+#include "wx/menu.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -44,20 +45,6 @@ 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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxGenericDirDialog
 //-----------------------------------------------------------------------------


@@ -92,6 +79,8 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
 {
     wxBusyCursor cursor;
 
 {
     wxBusyCursor cursor;
 

+    parent = GetParentForModalDialog(parent, style);
+

     if (!wxDirDialogBase::Create(parent, title, defaultPath, style, pos, sz, name))
         return false;
 
     if (!wxDirDialogBase::Create(parent, title, defaultPath, style, pos, sz, name))
         return false;
 


@@ -109,7 +98,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
     wxMenu *dirMenu = new wxMenu;
     dirMenu->Append(ID_GO_HOME, _("Home"));
 
     wxMenu *dirMenu = new wxMenu;
     dirMenu->Append(ID_GO_HOME, _("Home"));
 

-    if (style & wxDD_NEW_DIR_BUTTON)
+    if (!HasFlag(wxDD_DIR_MUST_EXIST))

     {
         dirMenu->Append(ID_NEW, _("New directory"));
     }
     {
         dirMenu->Append(ID_NEW, _("New directory"));
     }


@@ -133,7 +122,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
 
     // I'm not convinced we need a New button, and we tend to get annoying
     // accidental-editing with label editing enabled.
 
     // I'm not convinced we need a New button, and we tend to get annoying
     // accidental-editing with label editing enabled.

-    if (style & wxDD_NEW_DIR_BUTTON)
+    if (!HasFlag(wxDD_DIR_MUST_EXIST))

     {
         wxBitmapButton* newButton =
             new wxBitmapButton(this, ID_NEW,
     {
         wxBitmapButton* newButton =
             new wxBitmapButton(this, ID_NEW,


@@ -158,7 +147,7 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
     long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER;
 
 #ifdef __WXMSW__
     long dirStyle = wxDIRCTRL_DIR_ONLY | wxDEFAULT_CONTROL_BORDER;
 
 #ifdef __WXMSW__

-    if (style & wxDD_NEW_DIR_BUTTON)
+    if (!HasFlag(wxDD_DIR_MUST_EXIST))

     {
         // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
         // before we can call EditLabel (required for "New directory")
     {
         // Only under Windows do we need the wxTR_EDIT_LABEL tree control style
         // before we can call EditLabel (required for "New directory")


@@ -171,32 +160,31 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
                                      wxSize(300, 200),
                                      dirStyle);
 
                                      wxSize(300, 200),
                                      dirStyle);
 

-    topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
+    wxSizerFlags flagsBorder2;
+    flagsBorder2.DoubleBorder(wxTOP | wxLEFT | wxRIGHT);
+
+    topsizer->Add(m_dirCtrl, wxSizerFlags(flagsBorder2).Proportion(1).Expand());

 
 #ifndef __SMARTPHONE__
 
 #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 );
+    // TODO: Make this an option depending on a flag?
+    wxCheckBox *
+        check = new wxCheckBox(this, ID_SHOW_HIDDEN, _("Show &hidden directories"));
+    topsizer->Add(check, wxSizerFlags(flagsBorder2).Right());

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

-    topsizer->Add( m_input, 0, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, wxLARGESMALL(10,0) );
+    topsizer->Add(m_input, wxSizerFlags(flagsBorder2).Expand());

 
     // 3) buttons if any
 
     // 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
+    wxSizer *buttonSizer = CreateSeparatedButtonSizer(wxOK | wxCANCEL);
+    if ( buttonSizer )

     {
     {

-        topsizer->AddSpacer( wxLARGESMALL(10,0) );
-        delete buttonSizer;
+        topsizer->Add(buttonSizer, wxSizerFlags().Expand().DoubleBorder());

     }
 
 #ifdef __SMARTPHONE__
     }
 
 #ifdef __SMARTPHONE__

-    // overwrite menu achieved with earlier CreateButtonSizer() call
+    // overwrite menu set by CreateSeparatedButtonSizer() call above

     SetRightMenu(wxID_ANY, _("Options"), dirMenu);
 #endif
 
     SetRightMenu(wxID_ANY, _("Options"), dirMenu);
 #endif