Warning fixes and source cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/aui/auibook.cpp b/src/aui/auibook.cpp
index 4ecd4c1617fee3c2cc2ef78e6cbff012bca0bd57..e6baedb46d8084c229c6f12521f96f4b2e7037f1 100644 (file)
--- a/src/aui/auibook.cpp
+++ b/src/aui/auibook.cpp
@@ -25,11 +25,11 @@
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/image.h"
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
     #include "wx/image.h"

+    #include "wx/menu.h"

 #endif
 
 #include "wx/aui/tabmdi.h"
 #include "wx/dcbuffer.h"
 #endif
 
 #include "wx/aui/tabmdi.h"
 #include "wx/dcbuffer.h"

-#include "wx/menu.h"

 
 #ifdef __WXMAC__
 #include "wx/mac/carbon/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/carbon/private.h"


@@ -201,7 +201,7 @@ wxAuiDefaultTabArt::wxAuiDefaultTabArt()
     {
         base_colour = wxAuiStepColour(base_colour, 92);
     }
     {
         base_colour = wxAuiStepColour(base_colour, 92);
     }

-    
+

     m_base_colour = base_colour;
     wxColor border_colour = wxAuiStepColour(base_colour, 75);
 
     m_base_colour = base_colour;
     wxColor border_colour = wxAuiStepColour(base_colour, 75);
 


@@ -244,7 +244,7 @@ void wxAuiDefaultTabArt::SetSizingInfo(const wxSize& tab_ctrl_size,
     m_fixed_tab_width = 100;
 
     int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;
     m_fixed_tab_width = 100;
 
     int tot_width = (int)tab_ctrl_size.x - GetIndentSize() - 4;

-    
+

     if (m_flags & wxAUI_NB_CLOSE_BUTTON)
         tot_width -= m_active_close_bmp.GetWidth();
     if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)
     if (m_flags & wxAUI_NB_CLOSE_BUTTON)
         tot_width -= m_active_close_bmp.GetWidth();
     if (m_flags & wxAUI_NB_WINDOWLIST_BUTTON)


@@ -381,7 +381,7 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
     // we'll just use a rectangle for the clipping region for now --
     dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
 
     // we'll just use a rectangle for the clipping region for now --
     dc.SetClippingRegion(tab_x, tab_y, clip_width+1, tab_height-3);
 

-    
+

     wxPoint border_points[6];
     border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
     border_points[1] = wxPoint(tab_x,             tab_y+2);
     wxPoint border_points[6];
     border_points[0] = wxPoint(tab_x,             tab_y+tab_height-4);
     border_points[1] = wxPoint(tab_x,             tab_y+2);


@@ -441,15 +441,15 @@ void wxAuiDefaultTabArt::DrawTab(wxDC& dc,
         r.width -= 4;
         r.height /= 2;
         r.height--;
         r.width -= 4;
         r.height /= 2;
         r.height--;

-        
+

         // -- draw top gradient fill for glossy look
         wxColor top_color = m_base_colour;
         wxColor bottom_color = wxAuiStepColour(top_color, 160);
         dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);
         // -- draw top gradient fill for glossy look
         wxColor top_color = m_base_colour;
         wxColor bottom_color = wxAuiStepColour(top_color, 160);
         dc.GradientFillLinear(r, bottom_color, top_color, wxNORTH);

-        
+

         r.y += r.height;
         r.y--;
         r.y += r.height;
         r.y--;

-        
+

         // -- draw bottom fill for glossy look
         top_color = m_base_colour;
         bottom_color = m_base_colour;
         // -- draw bottom fill for glossy look
         top_color = m_base_colour;
         bottom_color = m_base_colour;


@@ -660,7 +660,7 @@ int wxAuiDefaultTabArt::ShowDropDown(wxWindow* wnd,
                                      const wxAuiNotebookPageArray& pages,
                                      int active_idx)
 {
                                      const wxAuiNotebookPageArray& pages,
                                      int active_idx)
 {

-       wxMenu menuPopup;
+    wxMenu menuPopup;

 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)
 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)


@@ -710,7 +710,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
         measure_bmp.Create(required_bmp_size.x,
                            required_bmp_size.y);
     }
         measure_bmp.Create(required_bmp_size.x,
                            required_bmp_size.y);
     }

-    
+

 
     int max_y = 0;
     size_t i, page_count = pages.GetCount();
 
     int max_y = 0;
     size_t i, page_count = pages.GetCount();


@@ -736,7 +736,7 @@ int wxAuiDefaultTabArt::GetBestTabCtrlSize(wxWindow* wnd,
                               true,
                               wxAUI_BUTTON_STATE_HIDDEN,
                               &x_ext);
                               true,
                               wxAUI_BUTTON_STATE_HIDDEN,
                               &x_ext);

-                              
+

         max_y = wxMax(max_y, s.y);
     }
 
         max_y = wxMax(max_y, s.y);
     }
 


@@ -1107,7 +1107,7 @@ int wxAuiSimpleTabArt::ShowDropDown(wxWindow* wnd,
                                     const wxAuiNotebookPageArray& pages,
                                     int active_idx)
 {
                                     const wxAuiNotebookPageArray& pages,
                                     int active_idx)
 {

-       wxMenu menuPopup;
+    wxMenu menuPopup;

 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)
 
     size_t i, count = pages.GetCount();
     for (i = 0; i < count; ++i)


@@ -1950,7 +1950,7 @@ BEGIN_EVENT_TABLE(wxAuiTabCtrl, wxControl)
     EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
     EVT_MOTION(wxAuiTabCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)
     EVT_LEFT_UP(wxAuiTabCtrl::OnLeftUp)
     EVT_MOTION(wxAuiTabCtrl::OnMotion)
     EVT_LEAVE_WINDOW(wxAuiTabCtrl::OnLeaveWindow)

-    EVT_AUINOTEBOOK_BUTTON(-1, wxAuiTabCtrl::OnButton)
+    EVT_AUINOTEBOOK_BUTTON(wxID_ANY, wxAuiTabCtrl::OnButton)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 


@@ -2358,7 +2358,7 @@ void wxAuiNotebook::InitNotebook(long style)
     m_dummy_wnd = NULL;
     m_flags = (unsigned int)style;
     m_tab_ctrl_height = 20;
     m_dummy_wnd = NULL;
     m_flags = (unsigned int)style;
     m_tab_ctrl_height = 20;

-    
+

     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);
     m_normal_font = *wxNORMAL_FONT;
     m_selected_font = *wxNORMAL_FONT;
     m_selected_font.SetWeight(wxBOLD);


@@ -2401,7 +2401,7 @@ void wxAuiNotebook::SetArtProvider(wxAuiTabArt* art)
 void wxAuiNotebook::SetTabCtrlHeight(int height)
 {
     m_requested_tabctrl_height = height;
 void wxAuiNotebook::SetTabCtrlHeight(int height)
 {
     m_requested_tabctrl_height = height;

-    
+

     // if window is already initialized, recalculate the tab height
     if (m_dummy_wnd)
     {
     // if window is already initialized, recalculate the tab height
     if (m_dummy_wnd)
     {


@@ -2420,7 +2420,7 @@ void wxAuiNotebook::SetTabCtrlHeight(int height)
 void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size)
 {
     m_requested_bmp_size = size;
 void wxAuiNotebook::SetUniformBitmapSize(const wxSize& size)
 {
     m_requested_bmp_size = size;

-    
+

     // if window is already initialized, recalculate the tab height
     if (m_dummy_wnd)
     {
     // if window is already initialized, recalculate the tab height
     if (m_dummy_wnd)
     {


@@ -2434,7 +2434,7 @@ void wxAuiNotebook::UpdateTabCtrlHeight()
 {
     // get the tab ctrl height we will use
     int height = CalculateTabCtrlHeight();
 {
     // get the tab ctrl height we will use
     int height = CalculateTabCtrlHeight();

-    
+

     // if the tab control height needs to change, update
     // all of our tab controls with the new height
     if (m_tab_ctrl_height != height)
     // if the tab control height needs to change, update
     // all of our tab controls with the new height
     if (m_tab_ctrl_height != height)


@@ -2462,7 +2462,7 @@ void wxAuiNotebook::UpdateTabCtrlHeight()
 void wxAuiNotebook::UpdateHintWindowSize()
 {
     wxSize size = CalculateNewSplitSize();
 void wxAuiNotebook::UpdateHintWindowSize()
 {
     wxSize size = CalculateNewSplitSize();

-    
+

     // the placeholder hint window should be set to this size
     wxAuiPaneInfo& info = m_mgr.GetPane(wxT("dummy"));
     if (info.IsOk())
     // the placeholder hint window should be set to this size
     wxAuiPaneInfo& info = m_mgr.GetPane(wxT("dummy"));
     if (info.IsOk())


@@ -2490,7 +2490,7 @@ wxSize wxAuiNotebook::CalculateNewSplitSize()
     }
 
     wxSize new_split_size;
     }
 
     wxSize new_split_size;

-    
+

     // if there is only one tab control, the first split
     // should happen around the middle
     if (tab_ctrl_count < 2)
     // if there is only one tab control, the first split
     // should happen around the middle
     if (tab_ctrl_count < 2)


@@ -2505,7 +2505,7 @@ wxSize wxAuiNotebook::CalculateNewSplitSize()
         // that needs to be implemented
         new_split_size = wxSize(180,180);
     }
         // that needs to be implemented
         new_split_size = wxSize(180,180);
     }

-    
+

     return new_split_size;
 }
 
     return new_split_size;
 }
 


@@ -2516,7 +2516,7 @@ int wxAuiNotebook::CalculateTabCtrlHeight()
     // tab height
     if (m_requested_tabctrl_height != -1)
         return m_requested_tabctrl_height;
     // tab height
     if (m_requested_tabctrl_height != -1)
         return m_requested_tabctrl_height;

-        
+

     // find out new best tab height
     wxAuiTabArt* art = m_tabs.GetArtProvider();
 
     // find out new best tab height
     wxAuiTabArt* art = m_tabs.GetArtProvider();
 


@@ -2771,9 +2771,9 @@ int wxAuiNotebook::GetSelection() const
 size_t wxAuiNotebook::SetSelection(size_t new_page)
 {
     // don't change the page unless necessary
 size_t wxAuiNotebook::SetSelection(size_t new_page)
 {
     // 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);
     if (!wnd)
         return m_curpage;
     wxWindow* wnd = m_tabs.GetWindowFromIdx(new_page);
     if (!wnd)
         return m_curpage;


@@ -2936,7 +2936,7 @@ bool wxAuiNotebook::FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx)
 void wxAuiNotebook::OnSize(wxSizeEvent& evt)
 {
     UpdateHintWindowSize();
 void wxAuiNotebook::OnSize(wxSizeEvent& evt)
 {
     UpdateHintWindowSize();

-    
+

     evt.Skip();
 }
 
     evt.Skip();
 }
 


@@ -3285,10 +3285,10 @@ void wxAuiNotebook::OnTabEndDrag(wxCommandEvent& command_evt)
 
         // force the set selection function reset the selection
         m_curpage = -1;
 
         // force the set selection function reset the selection
         m_curpage = -1;

-        
+

         // set the active page to the one we just split off
         SetSelection(m_tabs.GetIdxFromWindow(page_info.window));
         // set the active page to the one we just split off
         SetSelection(m_tabs.GetIdxFromWindow(page_info.window));

-        
+

         UpdateHintWindowSize();
     }
 }
         UpdateHintWindowSize();
     }
 }