Remove unused vars

[abligh]

This patch (against 0.9.1) removes unused variables and the consequent compiler warnings if -Wall if switched on. It is available under the wxWidgets license, of course.

Code: Select all

--- src/manager.cpp.keep        2006-01-10 21:15:34.000000000 +0000
+++ src/manager.cpp     2006-01-10 21:16:49.000000000 +0000
@@ -1815,9 +1815,6 @@
     // create the sizer for the dock
     wxSizer* dock_sizer = new wxBoxSizer(orientation);

-    // this flag determines if there will be space left.
-    bool space_left = true;
-
     // add each pane to the dock
     int pane_i, pane_count = dock.panes.GetCount();

@@ -2178,9 +2175,7 @@
     // create a bunch of box sizers,
     // from the innermost level outwards.
     wxSizer* cont = NULL;
-    wxSizer* top = NULL;
     wxSizer* middle = NULL;
-    wxSizer* bottom = NULL;
     int layer = 0;
     int row, row_count;

@@ -3370,8 +3365,6 @@
         if (part.sizer_item && !part.sizer_item->IsShown())
             continue;

-        int pane_state = (part.pane ? part.pane->state : 0);
-
         switch (part.type)
         {
             case wxDockUIPart::typeDockSizer:


[Ben]

Wonderful, thanks. Applied.

Ben

[Michael]

Hello,

I have a question concerning the patch. When compiling wxAUI, I get 5 unused variables, but the patch just lists 4.

I also got that one:

wxAUI\manager.cpp: In member function `void wxFrameManager::OnFloatingPaneActivated(wxWindow*)':
wxAUI\manager.cpp:3314: warning: unused variable 'pane'

Looking at the function:

Code: Select all

void wxFrameManager::OnFloatingPaneActivated(wxWindow* wnd)
{
    if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
    {
        // try to find the pane
        wxPaneInfo& pane = GetPane(wnd);
        wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));

        SetActivePane(m_panes, wnd);
        Repaint();
    }
}


I suppose that pane is just used in debugging.

Aynway, it looks a bit strange that 'SetActivePane' uses 'm_panes' and not 'pane'. Is this really correct this way? And is the call to GetPane really necessary then?

Thank you very much.

Best wishes,
Michael

[Ben]

Yeah, the code is correct. I suppose the check to make sure the pane exists is a bit pedantic, so I'll take care of the problem by removing the unnecessary code.

[Michael]

Hello,

Thank you very much for your reply .

Best wishes,
Michael

[TDragon]

Not sure if this code has been removed or not (it hasn't been as far as I can tell in the version Code::Blocks IDE uses, possibly an older version), but if you want to keep the sanity check you can just surround those two lines (the one with wxASSERT_MSG and the one directly above it) with #ifdef __WXDEBUG__ / #endif. This is correct because the wxASSERT_MSG macro is only expanded when __WXDEBUG__ is defined, and that assertion is the only place where the "pane" variable might be used.