Warning fixes and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,11 +25,11 @@
|
|||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/settings.h"
|
#include "wx/settings.h"
|
||||||
#include "wx/image.h"
|
#include "wx/image.h"
|
||||||
|
#include "wx/menu.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/aui/tabmdi.h"
|
#include "wx/aui/tabmdi.h"
|
||||||
#include "wx/dcbuffer.h"
|
#include "wx/dcbuffer.h"
|
||||||
#include "wx/menu.h"
|
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
#include "wx/mac/carbon/private.h"
|
#include "wx/mac/carbon/private.h"
|
||||||
@@ -660,7 +660,7 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
|
|||||||
const wxAuiNotebookPageArray& pages,
|
const wxAuiNotebookPageArray& pages,
|
||||||
int active_idx)
|
int active_idx)
|
||||||
{
|
{
|
||||||
wxMenu menuPopup;
|
wxMenu menuPopup;
|
||||||
|
|
||||||
size_t i, count = pages.GetCount();
|
size_t i, count = pages.GetCount();
|
||||||
for (i = 0; i < count; ++i)
|
for (i = 0; i < count; ++i)
|
||||||
@@ -1107,7 +1107,7 @@ int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
|
|||||||
const wxAuiNotebookPageArray& pages,
|
const wxAuiNotebookPageArray& pages,
|
||||||
int active_idx)
|
int active_idx)
|
||||||
{
|
{
|
||||||
wxMenu menuPopup;
|
wxMenu menuPopup;
|
||||||
|
|
||||||
size_t i, count = pages.GetCount();
|
size_t i, count = pages.GetCount();
|
||||||
for (i = 0; i < count; ++i)
|
for (i = 0; i < count; ++i)
|
||||||
@@ -1950,7 +1950,7 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
|
|||||||
EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
|
EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
|
||||||
EVT_MOTION(wxAuiTabCtrl::OnMotion)
|
EVT_MOTION(wxAuiTabCtrl::OnMotion)
|
||||||
EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
|
EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
|
||||||
EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
|
EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
|
|
||||||
@@ -2771,7 +2771,7 @@ int wxAuiNotebook::GetSelection() const
|
|||||||
size_t wxAuiNotebook::SetSelection(size_t new_page)
|
size_t wxAuiNotebook::SetSelection(size_t new_page)
|
||||||
{
|
{
|
||||||
// don't change the page unless necessary
|
// don't change the page unless necessary
|
||||||
if (new_page == m_curpage)
|
if ((int)new_page == m_curpage)
|
||||||
return m_curpage;
|
return m_curpage;
|
||||||
|
|
||||||
wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
|
wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
|
||||||
|
Reference in New Issue
Block a user