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

Implement wxNotebook::CalcSizeFromPage() for wxGTK.

Browse Source 
The implementation is far from perfect as it relies on hard-coded margins but
is better than nothing as it allows wxNotebook best size determination and
SetPageSize() method to work correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-12-24 18:19:26 +00:00
parent b73da1a41b
commit 864181f4f6
5 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
samples/notebook/notebook.cpp
View File

@@ -239,6 +239,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ID_NEXT_PAGE, MyFrame::OnNextPage)
EVT_MENU(ID_CHANGE_SELECTION, MyFrame::OnChangeSelection)
EVT_MENU(ID_SET_SELECTION, MyFrame::OnSetSelection)
EVT_MENU(ID_GET_PAGE_SIZE, MyFrame::OnGetPageSize)
EVT_MENU(ID_SET_PAGE_SIZE, MyFrame::OnSetPageSize)
#if wxUSE_HELP
EVT_MENU(ID_CONTEXT_HELP, MyFrame::OnContextHelp)
@@ -369,6 +371,9 @@ MyFrame::MyFrame()
menuPageOperations->AppendSeparator();
menuPageOperations->Append(ID_CHANGE_SELECTION, wxT("&Change selection to 0\tCtrl-0"));
menuPageOperations->Append(ID_SET_SELECTION, wxT("&Set selection to 0\tShift-Ctrl-0"));
menuPageOperations->AppendSeparator();
menuPageOperations->Append(ID_GET_PAGE_SIZE, "Sho&w page size");
menuPageOperations->Append(ID_SET_PAGE_SIZE, "Set &page size");
wxMenu *menuOperations = new wxMenu;
#if wxUSE_HELP
@@ -908,6 +913,33 @@ void MyFrame::OnSetSelection(wxCommandEvent& WXUNUSED(event))
currBook->SetSelection(0);
}
void MyFrame::OnGetPageSize(wxCommandEvent& WXUNUSED(event))
{
wxBookCtrlBase* const currBook = GetCurrentBook();
if ( !currBook )
return;
const wxSize sizePage = currBook->GetPage(0)->GetSize();
const wxSize sizeBook = currBook->GetSize();
wxLogMessage("Page size is (%d, %d), book size (%d, %d)",
sizePage.x, sizePage.y,
sizeBook.x, sizeBook.y);
}
void MyFrame::OnSetPageSize(wxCommandEvent& WXUNUSED(event))
{
wxBookCtrlBase* const currBook = GetCurrentBook();
if ( !currBook )
return;
const wxSize sizePage(300, 300);
currBook->SetPageSize(sizePage);
wxLogMessage("Page size set to (%d, %d)",
sizePage.x, sizePage.y);
}
void MyFrame::OnIdle( wxIdleEvent& WXUNUSED(event) )
{
static int s_nPages = wxNOT_FOUND;