Skip to content

Addapting more to wx post v3.1.3 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dememax wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Addapting more to wx post v3.1.3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a2ba41
Addapting to wx post v3.1.3: 1) Sizer flags 2) transferBottomPane() A…
dememax Dec 11, 2019
772007f
Addapting to wx post v3.1.3: Sizer flags for preferences dialog
dememax Dec 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/PrefsUnifiedDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ void PrefsUnifiedDlg::CreateEventPanels(const int idx, const wxString& vars, wxW
wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );

wxCheckBox *item9 = new wxCheckBox( parent, USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 1, _("Enable command execution on core"), wxDefaultPosition, wxDefaultSize, 0 );
item7->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
item7->Add( item9, 0, /*wxALIGN_CENTER_VERTICAL|*/wxLEFT|wxRIGHT, 5 );

wxFlexGridSizer *item10 = new wxFlexGridSizer( 3, 0, 0 );
item10->AddGrowableCol( 2 );
Expand All @@ -1253,10 +1253,10 @@ void PrefsUnifiedDlg::CreateEventPanels(const int idx, const wxString& vars, wxW
item12->Enable(CUserEvents::IsCoreCommandEnabled(static_cast<enum CUserEvents::EventType>(idx)));
item10->Add( item12, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );

item7->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
item7->Add( item10, 0, wxGROW/*|wxALIGN_CENTER_VERTICAL*/|wxALL, 0 );

wxCheckBox *item14 = new wxCheckBox( parent, USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 3, _("Enable command execution on GUI"), wxDefaultPosition, wxDefaultSize, 0 );
item7->Add( item14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
item7->Add( item14, 0, /*wxALIGN_CENTER_VERTICAL|*/wxLEFT|wxRIGHT, 5 );

wxFlexGridSizer *item15 = new wxFlexGridSizer( 3, 0, 0 );
item15->AddGrowableCol( 2 );
Expand All @@ -1270,12 +1270,12 @@ void PrefsUnifiedDlg::CreateEventPanels(const int idx, const wxString& vars, wxW
item17->Enable(CUserEvents::IsGUICommandEnabled(static_cast<enum CUserEvents::EventType>(idx)));
item15->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );

item7->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
item7->Add( item15, 0, wxGROW/*|wxALIGN_CENTER_VERTICAL*/|wxALL, 0 );

wxStaticText *item13 = new wxStaticText( parent, -1, _("The following variables will be replaced:") + vars, wxDefaultPosition, wxDefaultSize, 0 );
item7->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
item7->Add( item13, 0, wxGROW/*|wxALIGN_CENTER_VERTICAL*/|wxALL, 5 );

IDC_PREFS_EVENTS_PAGE->Add(item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
IDC_PREFS_EVENTS_PAGE->Add(item7, 0, wxGROW/*|wxALIGN_CENTER_VERTICAL*/|wxALL, 5);

IDC_PREFS_EVENTS_PAGE->Layout();
IDC_PREFS_EVENTS_PAGE->Hide(idx + 1);
Expand Down
2 changes: 1 addition & 1 deletion src/amuleDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@ void CamuleDlg::DoNetworkRearrange()

replacement->Reparent(m_networknotebooksizer->GetContainingWindow());
replacement->Show();
m_networknotebooksizer->Add(replacement, 1, wxGROW | wxALIGN_CENTER_VERTICAL | wxTOP, 5);
m_networknotebooksizer->Add(replacement, 1, wxGROW /*| wxALIGN_CENTER_VERTICAL*/ | wxTOP, 5);
m_networknotebooksizer->Layout();
currentState = newState;
}
Expand Down
Loading