From 4d15faa19e3debe28174ea57ecba26142690512d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 13 Sep 2023 16:21:02 +0000 Subject: [PATCH] amule, new recipe (#9411) --- .../amule/additional-files/EMule_mascot.iom | Bin 0 -> 106141 bytes net-p2p/amule/additional-files/amule.rdef.in | 376 ++++++++++++++ net-p2p/amule/amule-2.3.3.recipe | 106 ++++ net-p2p/amule/patches/amule-2.3.3.patchset | 80 +++ net-p2p/amule/patches/version_check.diff | 12 + net-p2p/amule/patches/wx3.2.patch | 461 ++++++++++++++++++ 6 files changed, 1035 insertions(+) create mode 100644 net-p2p/amule/additional-files/EMule_mascot.iom create mode 100644 net-p2p/amule/additional-files/amule.rdef.in create mode 100644 net-p2p/amule/amule-2.3.3.recipe create mode 100644 net-p2p/amule/patches/amule-2.3.3.patchset create mode 100644 net-p2p/amule/patches/version_check.diff create mode 100644 net-p2p/amule/patches/wx3.2.patch diff --git a/net-p2p/amule/additional-files/EMule_mascot.iom b/net-p2p/amule/additional-files/EMule_mascot.iom new file mode 100644 index 0000000000000000000000000000000000000000..497fe126e836755f5bddf5e2e2d6918ca58886fa GIT binary patch literal 106141 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 fIqcVEr>&Z amule.rdef + + addResourcesToBinaries amule.rdef $appsDir/aMule + + addAppDeskbarSymlink $appsDir/aMule +} diff --git a/net-p2p/amule/patches/amule-2.3.3.patchset b/net-p2p/amule/patches/amule-2.3.3.patchset new file mode 100644 index 000000000..a6127cdf3 --- /dev/null +++ b/net-p2p/amule/patches/amule-2.3.3.patchset @@ -0,0 +1,80 @@ +From 5401b5825357b2db9b3b3a364b286029d5c3f7be Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Mon, 11 Sep 2023 19:04:14 +0200 +Subject: Fix int type errors + + +diff --git a/src/Types.h b/src/Types.h +index 098e026..0dde23d 100644 +--- a/src/Types.h ++++ b/src/Types.h +@@ -94,13 +94,17 @@ + * Backwards compatibility with emule. + * Note that the int* types are indeed unsigned. + */ ++#ifdef __HAIKU__ ++#include ++#else + typedef uint8_t int8; +-typedef uint8_t uint8; + typedef uint16_t int16; +-typedef uint16_t uint16; + typedef uint32_t int32; +-typedef uint32_t uint32; + typedef uint64_t int64; ++#endif ++typedef uint8_t uint8; ++typedef uint16_t uint16; ++typedef uint32_t uint32; + typedef uint64_t uint64; + typedef int8_t sint8; + typedef int16_t sint16; +-- +2.37.3 + + +From bf8b4ab3821eaba11ec029f773c792c67b2951be Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Mon, 11 Sep 2023 19:04:57 +0200 +Subject: Fix linking errors with libnetwork and libbsd + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d66ce7b..f30a28d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -106,6 +106,8 @@ if (NOT SVNDATE) + message (STATUS "git revision ${SVNDATE} found") + endif() + ++add_definitions(-Wno-deprecated-declarations) # TODO too much spam for now ++ + include (cmake/bfd.cmake) + + configure_file ( +-- +2.37.3 + + +From 8d7cff8fafa8def7884dab98da3a51a25459d9eb Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Mon, 11 Sep 2023 19:13:33 +0200 +Subject: amule-fix-exception.patch (from upstream) + + +diff --git a/src/libs/common/MuleDebug.cpp b/src/libs/common/MuleDebug.cpp +index f04e375..a655452 100644 +--- a/src/libs/common/MuleDebug.cpp ++++ b/src/libs/common/MuleDebug.cpp +@@ -55,7 +55,7 @@ + #endif + + #include +- ++#include + + /** + * This functions displays a verbose description of +-- +2.37.3 + diff --git a/net-p2p/amule/patches/version_check.diff b/net-p2p/amule/patches/version_check.diff new file mode 100644 index 000000000..e852dc941 --- /dev/null +++ b/net-p2p/amule/patches/version_check.diff @@ -0,0 +1,12 @@ +Disable NewVersionCheck by Default (Closes: #554623) +--- a/src/Preferences.cpp ++++ b/src/Preferences.cpp +@@ -1211,7 +1211,7 @@ void CPreferences::BuildItemList( const + /** + * Version check + **/ +- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true ))); ++ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false ))); + + /** + * Obfuscation diff --git a/net-p2p/amule/patches/wx3.2.patch b/net-p2p/amule/patches/wx3.2.patch new file mode 100644 index 000000000..58590c60f --- /dev/null +++ b/net-p2p/amule/patches/wx3.2.patch @@ -0,0 +1,461 @@ +Description: Fixes for wxWidgets 3.2 compatibility + Largely based on patch from Mr Hyde in + https://github.com/amule-project/amule/pull/168 +Author: Olly Betts +Bug: https://github.com/amule-project/amule/issues/340 +Bug-Debian: https://bugs.debian.org/1019841 +Forwarded: no +Last-Update: 2023-01-09 + +--- a/src/ColorFrameCtrl.cpp ++++ b/src/ColorFrameCtrl.cpp +@@ -61,7 +61,7 @@ + ///////////////////////////////////////////////////////////////////////////// + void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour) + { +- m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID)); ++ m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); + + Refresh(FALSE); + } // SetFrameColor +@@ -70,7 +70,7 @@ + ///////////////////////////////////////////////////////////////////////////// + void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour& colour) + { +- m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID)); ++ m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxBRUSHSTYLE_SOLID)); + + // clear out the existing garbage, re-start with a clean plot + Refresh(FALSE); +--- a/src/DownloadListCtrl.cpp ++++ b/src/DownloadListCtrl.cpp +@@ -850,7 +850,7 @@ + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc->SetPen( colour.Blend(65).GetPen() ); + } else { +- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + dc->SetPen(*wxTRANSPARENT_PEN); + } +@@ -1413,7 +1413,7 @@ + dc->DrawLine( rect.x, rect.y + 2, rect.x + width, rect.y + 2 ); + + // Draw the green line +- dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxSOLID ) )); ++ dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxPENSTYLE_SOLID ) )); + dc->DrawLine( rect.x, rect.y + 1, rect.x + width, rect.y + 1 ); + } + } +--- a/src/GenericClientListCtrl.cpp ++++ b/src/GenericClientListCtrl.cpp +@@ -660,7 +660,7 @@ + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT)); + dc->SetPen( colour.Blend(65).GetPen() ); + } else { +- dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT)); + dc->SetPen(*wxTRANSPARENT_PEN); + } +--- a/src/MuleColour.cpp ++++ b/src/MuleColour.cpp +@@ -35,7 +35,7 @@ + std::map wxPenCache; + std::map wxBrushCache; + +-const wxPen& CMuleColour::GetPen(int width, int style) const ++const wxPen& CMuleColour::GetPen(int width, wxPenStyle style) const + { + #if USE_MULE_PEN_CACHE + wxPen* result = NULL; +@@ -61,7 +61,7 @@ + #endif + } + +-const wxBrush& CMuleColour::GetBrush(int style) const ++const wxBrush& CMuleColour::GetBrush(wxBrushStyle style) const + { + #if USE_MULE_BRUSH_CACHE + wxBrush* result = NULL; +--- a/src/MuleColour.h ++++ b/src/MuleColour.h +@@ -27,6 +27,9 @@ + + #include + #include ++#include // needed for wxPenStyle enum values ++#include // needed for wxBrushStyle enum values ++#include // needed for wxFontStyle enum values + #include "Types.h" + + class wxPen; +@@ -95,8 +98,8 @@ + return wxColor(m_red, m_green, m_blue); + } + +- const wxPen& GetPen(int width = 1, int style = wxSOLID) const; +- const wxBrush& GetBrush(int style = wxSOLID) const; ++ const wxPen& GetPen(int width = 1, wxPenStyle style = wxPENSTYLE_SOLID) const; ++ const wxBrush& GetBrush(wxBrushStyle style = wxBRUSHSTYLE_SOLID) const; + + private: + uint8_t m_red; +--- a/src/MuleGifCtrl.cpp ++++ b/src/MuleGifCtrl.cpp +@@ -167,7 +167,7 @@ + int x = (clientsize.GetWidth()-gifsize.GetWidth())/2; + int y = (clientsize.GetHeight()-gifsize.GetHeight())/2; + +- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID))); ++ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxBRUSHSTYLE_SOLID))); + dc.Clear(); + dc.DrawBitmap(m_frame, x, y, true); + } +--- a/src/OScopeCtrl.cpp ++++ b/src/OScopeCtrl.cpp +@@ -74,7 +74,7 @@ + PlotData_t* ppds = pdsTrends; + for(unsigned i=0; icrPlot = (i<15 ? crPreset[i] : *wxWHITE); +- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID)); ++ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID)); + ppds->fPrev = ppds->fLowerLimit = ppds->fUpperLimit = 0.0; + } + +@@ -166,7 +166,7 @@ + if (ppds->crPlot == cr) + return; + ppds->crPlot = cr; +- ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID)); ++ ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxPENSTYLE_SOLID)); + InvalidateGraph(); + } + +@@ -179,7 +179,7 @@ + } + + m_bgColour = cr; +- brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxSOLID)); ++ brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxBRUSHSTYLE_SOLID)); + InvalidateCtrl() ; + } + +@@ -196,7 +196,7 @@ + + wxMemoryDC dcGrid(m_bmapGrid); + +- wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxSOLID)); ++ wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_SOLID)); + wxString strTemp; + + // fill the grid background +@@ -213,7 +213,7 @@ + dcGrid.SetPen(wxNullPen); + + // create some fonts (horizontal and vertical) +- wxFont axisFont(10, wxSWISS, wxNORMAL, wxNORMAL, false); ++ wxFont axisFont(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false); + dcGrid.SetFont(axisFont); + + // y max +@@ -320,7 +320,7 @@ + // operation, preventing us from simply blitting the plot on top of + // the grid bitmap. + +- dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxLONG_DASH))); ++ dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxPENSTYLE_LONG_DASH))); + for (unsigned j = 1; j < (nYGrids + 1); ++j) { + unsigned GridPos = (m_rectPlot.GetHeight())*j/( nYGrids + 1 ) + m_rectPlot.GetTop(); + +--- a/src/SearchListCtrl.cpp ++++ b/src/SearchListCtrl.cpp +@@ -826,7 +826,7 @@ + + // Define the border of the drawn area + if (highlighted) { +- dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxSOLID))); ++ dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxPENSTYLE_SOLID))); + } else { + dc->SetPen(*wxTRANSPARENT_PEN); + dc->SetTextForeground(GetItemTextColour(item)); +@@ -912,7 +912,7 @@ + const int middle = cur_rec.y + ( cur_rec.height + 1 ) / 2; + + // Set up a new pen for drawing the tree +- dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxSOLID)) ); ++ dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxPENSTYLE_SOLID)) ); + + if (file->GetParent()) { + // Draw the line to the filename +--- a/src/ServerListCtrl.cpp ++++ b/src/ServerListCtrl.cpp +@@ -327,7 +327,7 @@ + wxFont font = GetFont(); + + if ( highlight ) { +- font.SetWeight( wxBOLD ); ++ font.SetWeight( wxFONTWEIGHT_BOLD ); + + m_connected = server; + } +--- a/src/extern/wxWidgets/listctrl.cpp ++++ b/src/extern/wxWidgets/listctrl.cpp +@@ -1453,7 +1453,7 @@ + if ( highlighted ) + dc->SetBrush( m_owner->GetHighlightBrush() ); + else +- dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxSOLID))); ++ dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxBRUSHSTYLE_SOLID))); + + dc->SetPen( *wxTRANSPARENT_PEN ); + +@@ -2325,7 +2325,7 @@ + ( + wxSYS_COLOUR_HIGHLIGHT + ), +- wxSOLID ++ wxBRUSHSTYLE_SOLID + )); + + m_highlightUnfocusedBrush = *(wxTheBrushList->FindOrCreateBrush( +@@ -2333,7 +2333,7 @@ + ( + wxSYS_COLOUR_BTNSHADOW + ), +- wxSOLID ++ wxBRUSHSTYLE_SOLID + )); + + SetScrollbars( 0, 0, 0, 0, 0, 0 ); +@@ -2734,7 +2734,7 @@ + + // Ensure an uniform background color, as to avoid differences between + // the automatically cleared parts and the rest of the canvas. +- dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID))); ++ dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxBRUSHSTYLE_SOLID))); + + // We need to clear the DC manually, since we intercept BG-erase events. + // Clearing must be done first thing because caching of the double-buffering causes artifacts otherwise. +@@ -2805,7 +2805,7 @@ + + if ( HasFlag(wxLC_HRULES) ) + { +- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID)); ++ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID)); + wxSize clientSize = GetClientSize(); + + size_t i = visibleFrom; +@@ -2831,7 +2831,7 @@ + // Draw vertical rules if required + if ( HasFlag(wxLC_VRULES) && !IsEmpty() ) + { +- wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID)); ++ wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxPENSTYLE_SOLID)); + wxRect firstItemRect, lastItemRect; + + GetItemRect(visibleFrom, firstItemRect); +@@ -4859,12 +4859,15 @@ + + void wxListMainWindow::OnScroll(wxScrollWinEvent& event) + { ++ // wxScrolledWindows::OnScroll is deprecated in wx 3.0.0 and it does not exist anymore in 3.1.0. ++ // Please also notice that call to ++ // - wxScrolledWindow::OnScroll ++ // - HandleOnScroll ++ // have been removed in code present in ++ // src/generic/listctrl.cpp, wxListMainWindow::OnScroll ++ // of wxWidgets 3.0 + // FIXME +-#if ( defined(__WXGTK__) || defined(__WXMAC__) ) && !defined(__WXUNIVERSAL__) +- wxScrolledWindow::OnScroll(event); +-#else + HandleOnScroll( event ); +-#endif + + // update our idea of which lines are shown when we redraw the window the + // next time +--- a/src/extern/wxWidgets/listctrl.h ++++ b/src/extern/wxWidgets/listctrl.h +@@ -16,7 +16,6 @@ + #include + + #define wxLC_OWNERDRAW 0x10000 +-#define WXWIN_COMPATIBILITY_2_8 1 + + #include + +--- a/src/muuli_wdr.cpp ++++ b/src/muuli_wdr.cpp +@@ -77,7 +77,7 @@ + + CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, -1, wxT(""), wxDefaultPosition, wxSize(-1,20), wxTE_MULTILINE ); + item4->SetName( wxT("FastEd2kLinks") ); +- item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 ); ++ item2->Add( item4, 1, wxALL|wxEXPAND, 5 ); + + wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Commit"), wxDefaultPosition, wxDefaultSize, 0 ); + item5->SetToolTip( _("Click here to add the eD2k link in the text control to your download queue.") ); +@@ -474,7 +474,7 @@ + item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); + + CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER ); +- item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item0->Add( item6, 1, wxGROW, 5 ); + + if (set_sizer) + { +@@ -1048,7 +1048,7 @@ + wxWindow *item3 = new COScopeCtrl(3,1,GRAPH_DOWN,parent); + item3->SetName(wxT("dloadScope")); + wxASSERT( item3 ); +- item1->Add( item3, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item1->Add( item3, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 ); + item4->AddGrowableCol( 0 ); +@@ -1089,7 +1089,7 @@ + + item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); ++ item0->Add( item1, 1, wxGROW|wxBOTTOM, 5 ); + + wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Upload-Speed") ); + wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL ); +@@ -1097,7 +1097,7 @@ + wxWindow *item16 = new COScopeCtrl(3,1,GRAPH_UP,parent); + item16->SetName(wxT("uloadScope")); + wxASSERT( item16 ); +- item14->Add( item16, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item14->Add( item16, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 ); + item17->AddGrowableCol( 0 ); +@@ -1138,7 +1138,7 @@ + + item14->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item14, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); ++ item0->Add( item14, 1, wxGROW|wxBOTTOM, 5 ); + + wxStaticBox *item28 = new wxStaticBox( parent, -1, _("Connections") ); + wxStaticBoxSizer *item27 = new wxStaticBoxSizer( item28, wxVERTICAL ); +@@ -1146,7 +1146,7 @@ + wxWindow *item29 = new COScopeCtrl(3,0,GRAPH_CONN,parent); + item29->SetName(wxT("otherScope")); + wxASSERT( item29 ); +- item27->Add( item29, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item27->Add( item29, 1, wxGROW|wxALL, 5 ); + + wxFlexGridSizer *item30 = new wxFlexGridSizer( 2, 0, 0 ); + item30->AddGrowableCol( 0 ); +@@ -1187,16 +1187,15 @@ + + item27->Add( item30, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 ); + +- item0->Add( item27, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item0->Add( item27, 1, wxGROW|wxALL, 5 ); + + wxStaticBox *item41 = new wxStaticBox( parent, -1, _("Statistics Tree") ); + wxStaticBoxSizer *item40 = new wxStaticBoxSizer( item41, wxVERTICAL ); + + wxTreeCtrl *item42 = new wxTreeCtrl( parent, -1, wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS|wxSUNKEN_BORDER ); + item42->SetName( wxT("statTree") ); +- item40->Add( item42, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); +- +- item0->Add( item40, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 ); ++ item40->Add( item42, 1, wxGROW|wxALL, 5 ); ++ item0->Add( item40, 1, wxGROW|wxALL, 5 ); + + if (set_sizer) + { +@@ -2030,7 +2029,7 @@ + + wxStaticText *item2 = new wxStaticText( parent, -1, _("!!! WARNING !!!"), wxDefaultPosition, wxDefaultSize, 0 ); + item2->SetForegroundColour( *wxRED ); +- item2->SetFont( wxFont( 24, wxROMAN, wxNORMAL, wxNORMAL ) ); ++ item2->SetFont( wxFont( 24, wxFONTFAMILY_ROMAN, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL ) ); + item1->Add( item2, 0, wxALIGN_CENTER, 5 ); + + wxStaticText *item3 = new wxStaticText( parent, IDC_AMULE_TWEAKS_WARNING, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE ); +--- a/src/utils/wxCas/src/wxcasframe.cpp ++++ b/src/utils/wxCas/src/wxcasframe.cpp +@@ -280,11 +280,11 @@ + #ifdef __WINDOWS__ + + memdc. +- SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 6, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); + #else + + memdc. +- SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) ); ++ SetFont ( wxFont ( 8, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD ) ); + #endif + + memdc. +--- a/src/amuleDlg.cpp ++++ b/src/amuleDlg.cpp +@@ -763,7 +763,7 @@ + if ( (true == skinChanged) || (currentState != s_oldState) ) { + wxWindowUpdateLocker freezer(m_wndToolbar); + +- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONCONNECT); ++ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONCONNECT); + + switch (currentState) { + case ECS_Connecting: +@@ -784,8 +784,6 @@ + toolbarTool->SetNormalBitmap(m_tblist.GetBitmap(0)); + } + +- m_wndToolbar->InsertTool(0, toolbarTool); +- m_wndToolbar->Realize(); + m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady()); + + s_oldState = currentState; +@@ -1416,7 +1414,7 @@ + wxWindowUpdateLocker freezer(this); + #endif + +- wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONNETWORKS); ++ wxToolBarToolBase* toolbarTool = m_wndToolbar->FindById(ID_BUTTONNETWORKS); + + // set the log windows + wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook); +@@ -1507,12 +1505,9 @@ + + // Tool bar + +- m_wndToolbar->InsertTool(2, toolbarTool); + m_wndToolbar->EnableTool(ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia())); + m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady()); + +- m_wndToolbar->Realize(); +- + ShowConnectionState(); // status in the bottom right + m_searchwnd->FixSearchTypes(); + } +--- a/src/amule-gui.cpp ++++ b/src/amule-gui.cpp +@@ -28,6 +28,7 @@ + #include + + #include // Needed for wxClipBoard ++#include + #include // Needed for wxStringTokenizer + + #include "SharedFilesWnd.h" // Needed for CSharedFilesWnd +@@ -98,6 +99,11 @@ + + CamuleGuiBase::CamuleGuiBase() + { ++ // Disable these checks for now. The code really needs updating to ++ // eliminate these inconsistent flag uses, but these checks are new ++ // since wx3.0, and this should just return us to what 3.0 did. ++ wxSizerFlags::DisableConsistencyChecks(); ++ + amuledlg = NULL; + } +