Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a wxDD_NEW_DIR_BUTTON style for wxDirDialog (currently,

Browse Source 
works for the generic implementation only).
Renamed wxDIRCTRL_EDITABLE to wxDIRCTRL_EDIT_LABELS.
Removed reported memory leaks from dynload.cpp using wxModule --
this may cause problems if other modules want to use wxPluginLibrary.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-10 09:35:36 +00:00
parent 2240c9edce
commit dabd1377ce
10 changed files with 81 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/generic/dirdlgg.cpp
View File

@@ -93,14 +93,19 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title,
// I'm not convinced we need a New button, and we tend to get annoying
// accidental-editing with label editing enabled.
wxBitmapButton* newButton =
new wxBitmapButton(this, ID_NEW,
wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
if (style & wxDD_NEW_DIR_BUTTON)
{
wxBitmapButton* newButton =
new wxBitmapButton(this, ID_NEW,
wxArtProvider::GetBitmap(wxART_NEW_DIR, wxART_CMN_DIALOG));
buttonsizer->Add( newButton, 0, wxRIGHT, 10 );
#if wxUSE_TOOLTIPS
newButton->SetToolTip(_("Create new directory"));
#endif
}
#if wxUSE_TOOLTIPS
homeButton->SetToolTip(_("Go to home directory"));
newButton->SetToolTip(_("Create new directory"));
#endif
topsizer->Add( buttonsizer, 0, wxTOP | wxALIGN_RIGHT, 10 );
@@ -108,10 +113,21 @@ 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;
#ifdef __WXMSW__
if (style & wxDD_NEW_DIR_BUTTON)
{
// Only under Windows do we need the wxTR_EDIT_LABEL tree control style
// before we can call EditLabel (required for "New directory")
dirStyle |= wxDIRCTRL_EDIT_LABELS;
}
#endif
m_dirCtrl = new wxGenericDirCtrl(this, ID_DIRCTRL,
m_path, wxPoint(5, 5),
wxSize(300, 200),
wxDIRCTRL_DIR_ONLY|wxDIRCTRL_EDITABLE|wxSUNKEN_BORDER);
dirStyle);
topsizer->Add( m_dirCtrl, 1, wxTOP|wxLEFT|wxRIGHT | wxEXPAND, 10 );