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

Remove redundant wxAuiNotebook methods already present in wxBookCtrlBase.

Browse Source 
wxAuiNotebook already inherits perfectly workable AdvanceSelection() and
GetCurrentPage() methods from wxBookCtrlBase, no need to reimplement them in
it.

See #14309.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-25 09:48:26 +00:00
parent 44f4f7dda0
commit dbec0fc8d8
2 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/aui/auibook.h
View File

@@ -327,9 +327,6 @@ public:
// Gets the height of the notebook for a given page height // Gets the height of the notebook for a given page height
int GetHeightForPageHeight(int pageHeight); int GetHeightForPageHeight(int pageHeight);
// Advances the selection, generation page selection events
void AdvanceSelection(bool forward = true);
// Shows the window menu // Shows the window menu
bool ShowWindowMenu(); bool ShowWindowMenu();
@@ -347,8 +344,6 @@ public:
virtual int GetPageImage(size_t n) const; virtual int GetPageImage(size_t n) const;
virtual bool SetPageImage(size_t n, int imageId); virtual bool SetPageImage(size_t n, int imageId);
wxWindow* GetCurrentPage () const;
virtual int ChangeSelection(size_t n); virtual int ChangeSelection(size_t n);
virtual bool AddPage(wxWindow *page, const wxString &text, bool select, virtual bool AddPage(wxWindow *page, const wxString &text, bool select,

35
src/aui/auibook.cpp
View File

@@ -3235,34 +3235,6 @@ int wxAuiNotebook::GetHeightForPageHeight(int pageHeight)
return tabCtrlHeight + pageHeight + decorHeight; return tabCtrlHeight + pageHeight + decorHeight;
} }
// Advances the selection, generation page selection events
void wxAuiNotebook::AdvanceSelection(bool forward)
{
if (GetPageCount() <= 1)
return;
int currentSelection = GetSelection();
if (forward)
{
if (currentSelection == (int) (GetPageCount() - 1))
return;
else if (currentSelection == -1)
currentSelection = 0;
else
currentSelection ++;
}
else
{
if (currentSelection <= 0)
return;
else
currentSelection --;
}
SetSelection(currentSelection);
}
// Shows the window menu // Shows the window menu
bool wxAuiNotebook::ShowWindowMenu() bool wxAuiNotebook::ShowWindowMenu()
{ {
@@ -3313,13 +3285,6 @@ bool wxAuiNotebook::SetPageImage(size_t n, int imageId)
return SetPageBitmap(n, GetImageList()->GetBitmap(imageId)); return SetPageBitmap(n, GetImageList()->GetBitmap(imageId));
} }
wxWindow* wxAuiNotebook::GetCurrentPage () const
{
const int sel = GetSelection();
return sel == wxNOT_FOUND ? NULL : GetPage(sel);
}
int wxAuiNotebook::ChangeSelection(size_t n) int wxAuiNotebook::ChangeSelection(size_t n)
{ {
return DoModifySelection(n, false); return DoModifySelection(n, false);