diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 9074f6d892..35518fd79e 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -1917,7 +1917,7 @@ void wxAuiManager::LayoutAddPane(wxSizer* cont, } else { - sizer_item = cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND); + cont->Add(horz_pane_sizer, pane_proportion, wxEXPAND); } } diff --git a/src/aui/tabart.cpp b/src/aui/tabart.cpp index 59d3a796ba..3814d8dc31 100644 --- a/src/aui/tabart.cpp +++ b/src/aui/tabart.cpp @@ -527,7 +527,7 @@ void wxAuiGenericTabArt::DrawTab(wxDC& dc, } - int text_offset = tab_x + 8; + int text_offset; int close_button_width = 0; if (close_button_state != wxAUI_BUTTON_STATE_HIDDEN) { diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp index 802ba8bf6a..796c3462ff 100644 --- a/src/common/dcgraph.cpp +++ b/src/common/dcgraph.cpp @@ -832,9 +832,6 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points) wxCoord cy4 = (y1 + y2) / 2; path.AddQuadCurveToPoint(x1 , y1 ,cx4 , cy4 ); - - cx1 = cx4; - cy1 = cy4; } path.AddLineToPoint( x2 , y2 ); diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 53de22d010..5074092790 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -796,24 +796,6 @@ bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data ) memset( pd, 0, sizeof(PRINTDLG) ); m_printDlg = (void*) pd; - pd->lStructSize = sizeof(PRINTDLG); - pd->hwndOwner = NULL; - pd->hDevMode = NULL; // Will be created by PrintDlg - pd->hDevNames = NULL; // Ditto - - pd->Flags = PD_RETURNDEFAULT; - pd->nCopies = 1; - - // Pass the devmode data to the PRINTDLG structure, since it'll - // be needed when PrintDlg is called. - if (pd->hDevMode) - GlobalFree(pd->hDevMode); - - // Pass the devnames data to the PRINTDLG structure, since it'll - // be needed when PrintDlg is called. - if (pd->hDevNames) - GlobalFree(pd->hDevNames); - pd->hDevMode = static_cast(native_data->GetDevMode()); native_data->SetDevMode(NULL); diff --git a/src/osx/carbon/font.cpp b/src/osx/carbon/font.cpp index 93d0ffe7c2..309d57d417 100644 --- a/src/osx/carbon/font.cpp +++ b/src/osx/carbon/font.cpp @@ -793,8 +793,6 @@ void wxNativeFontInfo::InitFromFontDescriptor(CTFontDescriptorRef desc) wxCFDictionaryRef traits((CFDictionaryRef)CTFontDescriptorCopyAttribute(desc, kCTFontTraitsAttribute)); traits.GetValue(kCTFontSymbolicTrait).GetValue((int32_t*)&symbolicTraits, 0); - m_family = wxFONTFAMILY_DEFAULT; - if (symbolicTraits & kCTFontTraitMonoSpace) m_family = wxFONTFAMILY_TELETYPE; else diff --git a/src/qt/window.cpp b/src/qt/window.cpp index a969a61a2c..aabf049ad8 100644 --- a/src/qt/window.cpp +++ b/src/qt/window.cpp @@ -1423,7 +1423,6 @@ bool wxWindowQt::QtHandleMouseEvent ( QWidget *handler, QMouseEvent *event ) e.SetEventType( wxEVT_LEAVE_WINDOW ); ProcessWindowEvent( e ); - m_mouseInside = mouseInside; } }