--- audacity-src-2.0.5/configure.in~ 2013-10-19 09:31:48.000000000 +0200 +++ audacity-src-2.0.5/configure.in 2014-01-15 14:33:23.736199148 +0100 @@ -294,7 +294,7 @@ AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x]) case "${wx_version}" in - 2.8.*) + 2.8.*|3.0.*) echo "Great, you're using wxWidgets ${wx_version}!" ;; *) --- audacity-src-2.0.5/lib-src/lib-widget-extra/configure.in~ 2013-10-19 09:31:34.000000000 +0200 +++ audacity-src-2.0.5/lib-src/lib-widget-extra/configure.in 2014-01-15 14:35:09.519583138 +0100 @@ -142,7 +142,7 @@ AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x]) case "${wx_version}" in - 2.8.*) + 2.8.*|3.0.*) echo "Great, you're using wxWidgets ${wx_version}!" ;; *) --- audacity-src-2.0.5/lib-src/FileDialog/FileDialog.h~ 2013-10-19 09:31:33.000000000 +0200 +++ audacity-src-2.0.5/lib-src/FileDialog/FileDialog.h 2014-01-15 14:48:35.805376488 +0100 @@ -55,11 +55,11 @@ //---------------------------------------------------------------------------- wxString -FileSelector(const wxChar *message = wxFileSelectorPromptStr, +FileSelector(const wxChar *message = (wxChar *)wxFileSelectorPromptStr, const wxChar *default_path = NULL, const wxChar *default_filename = NULL, const wxChar *default_extension = NULL, - const wxChar *wildcard = wxFileSelectorDefaultWildcardStr, + const wxChar *wildcard = (wxChar *)wxFileSelectorDefaultWildcardStr, int flags = 0, wxWindow *parent = NULL, wxString label = wxEmptyString, --- audacity-src-2.0.5/lib-src/FileDialog/gtk/FileDialogPrivate.cpp 2014-01-15 18:42:47.255235243 +0100 +++ audacity-src-2.0.5/lib-src/FileDialog/gtk/FileDialogPrivate.cpp.org 2014-01-15 18:42:42.785091188 +0100 @@ -18,13 +18,17 @@ #include "../FileDialog.h" -#if defined(__WXGTK24__) && (!defined(__WXGPE__)) + + + +#if 1 #include #include "private.h" #include // chdir +#include "wx/defs.h" #include "wx/intl.h" #include "wx/filename.h" // wxFilename #include "wx/tokenzr.h" // wxStringTokenizer @@ -299,7 +303,7 @@ EndModal(wxID_OK); } else #endif - wxGenericFileDialog::OnListOk( event ); + wxGenericFileDialog::OnOk( event ); } int FileDialog::ShowModal() --- audacity-src-2.0.5/src/Sequence.cpp.org 2014-01-15 18:46:25.845608473 +0100 +++ audacity-src-2.0.5/src/Sequence.cpp 2014-01-15 18:54:18.464160530 +0100 @@ -1034,8 +1034,8 @@ _("Sequence has block file with length %s > mMaxSamples %s.\nTruncating to mMaxSamples."), Internat::ToString(((wxLongLong)(bb->f->GetLength())).ToDouble(), 0).c_str(), Internat::ToString(((wxLongLong)mMaxSamples).ToDouble(), 0).c_str()); - ::wxMessageBox(sMsg, _("Warning - Length in Writing Sequence"), wxICON_EXCLAMATION | wxOK); - ::wxLogWarning(sMsg); + wxMessageBox(sMsg, _("Warning - Length in Writing Sequence"), wxICON_EXCLAMATION | wxOK); + wxLogWarning(sMsg); bb->f->SetLength(mMaxSamples); } --- audacity-src-2.0.5/src/AudacityApp.cpp.org 2014-01-15 18:55:56.667324154 +0100 +++ audacity-src-2.0.5/src/AudacityApp.cpp 2014-01-15 19:35:30.704368875 +0100 @@ -1324,7 +1324,7 @@ } if (option < argc - 1 && - argv[option + 1] && + !argv[option + 1].IsEmpty() && !wxString(wxT("-blocksize")).CmpNoCase(argv[option])) { long theBlockSize; if (wxString(argv[option + 1]).ToLong(&theBlockSize)) { --- audacity-src-2.0.5/src/AudioIO.cpp~ 2013-10-19 09:31:48.000000000 +0200 +++ audacity-src-2.0.5/src/AudioIO.cpp 2014-01-15 19:36:45.000091144 +0100 @@ -561,7 +561,7 @@ wxString errStr = _("Could not find any audio devices.\n"); errStr += _("You will not be able to play or record audio.\n\n"); wxString paErrStr = LAT1CTOWX(Pa_GetErrorText(err)); - if (paErrStr) + if (!paErrStr.IsEmpty()) errStr += _("Error: ")+paErrStr; // XXX: we are in libaudacity, popping up dialogs not allowed! A // long-term solution will probably involve exceptions --- audacity-src-2.0.5/src/CaptureEvents.cpp~ 2013-10-19 09:31:48.000000000 +0200 +++ audacity-src-2.0.5/src/CaptureEvents.cpp 2014-01-15 19:45:04.053070193 +0100 @@ -76,8 +76,6 @@ // temporarily replace the global GDK event handler with our function gdk_event_handler_set((GdkEventFunc)main_do_event, &queue, NULL); - // temporarily suspend idle callbacks - wxTheApp->SuspendIdleCallback(); } CaptureEvents::~CaptureEvents() --- audacity-src-2.0.5/src/CaptureEvents.cpp~ 2014-01-15 19:45:04.000000000 +0100 +++ audacity-src-2.0.5/src/CaptureEvents.cpp 2014-01-15 19:45:45.754464727 +0100 @@ -59,9 +59,6 @@ break; } - // don't allow idle callbacks while we're active - wxTheApp->SuspendIdleCallback(); - return; } --- audacity-src-2.0.5/src/LyricsWindow.cpp~ 2013-10-19 09:31:49.000000000 +0200 +++ audacity-src-2.0.5/src/LyricsWindow.cpp 2014-01-15 19:51:24.312324357 +0100 @@ -72,7 +72,7 @@ #else wxIcon ic(wxICON(AudacityLogo48x48)); #endif - SetIcon(ic); + SetIcon((const wxIcon&)ic); #endif wxPoint panelPos(0, 0); --- audacity-src-2.0.5/src/Menus.cpp~ 2013-10-19 09:31:48.000000000 +0200 +++ audacity-src-2.0.5/src/Menus.cpp 2014-01-15 19:55:08.146305162 +0100 @@ -2403,7 +2403,7 @@ // The workaround is to queue a context menu event, allowing the key press // event to complete. wxContextMenuEvent e(wxEVT_CONTEXT_MENU, GetId()); - mTrackPanel->AddPendingEvent(e); + mTrackPanel->GetEventHandler()->AddPendingEvent(e); } void AudacityProject::OnTrackMute() --- audacity-src-2.0.5/src/MixerBoard.cpp.org 2014-01-15 19:56:40.262635794 +0100 +++ audacity-src-2.0.5/src/MixerBoard.cpp 2014-01-15 19:56:59.606597792 +0100 @@ -1727,7 +1727,7 @@ #else wxIcon ic(wxICON(AudacityLogo48x48)); #endif - SetIcon(ic); + SetIcon((const wxIcon&)ic); #endif } --- audacity-src-2.0.5/src/PitchName.cpp.org 2014-01-15 19:58:21.012574229 +0100 +++ audacity-src-2.0.5/src/PitchName.cpp 2014-01-15 20:07:39.509684788 +0100 @@ -20,6 +20,12 @@ #include #include +#include "wx/defs.h" +#include "wx/dlimpexp.h" +#include "wx/wxcrtbase.h" +#include "wx/wxcrtvararg.h" +#include "wx/wxcrt.h" + #include "PitchName.h" --- audacity-src-2.0.5/src/PlatformCompatibility.cpp.org 2014-01-15 20:31:30.447274594 +0100 +++ audacity-src-2.0.5/src/PlatformCompatibility.cpp 2014-01-15 20:31:50.037920878 +0100 @@ -37,9 +37,8 @@ static wxString path; if (!found) { - wxStandardPaths std; - path = std.GetExecutablePath(); + path = wxStandardPaths::Get().GetExecutablePath(); found = true; } @@ -65,4 +64,4 @@ #else return filePath; #endif -} \ Brak znaku nowej linii na końcu pliku +} --- audacity-src-2.0.5/src/Profiler.cpp~ 2013-10-19 09:31:49.000000000 +0200 +++ audacity-src-2.0.5/src/Profiler.cpp 2014-01-15 20:32:39.369547031 +0100 @@ -20,6 +20,9 @@ *//*******************************************************************/ +#include +#include + #include "Profiler.h" ///write to a profile at the end of the test. @@ -165,4 +168,4 @@ else return 0.0; } - \ Brak znaku nowej linii na końcu pliku + --- audacity-src-2.0.5/src/Project.cpp~ 2014-01-15 20:34:38.000000000 +0100 +++ audacity-src-2.0.5/src/Project.cpp 2014-01-15 20:35:31.352033096 +0100 @@ -988,7 +988,7 @@ wxIcon ic; ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48)); #endif - SetIcon(ic); + SetIcon((const wxIcon&)ic); #endif mIconized = false; --- audacity-src-2.0.5/src/Tags.cpp~ 2014-01-15 20:37:40.000000000 +0100 +++ audacity-src-2.0.5/src/Tags.cpp 2014-01-15 20:38:32.374915880 +0100 @@ -482,7 +482,7 @@ while (*attrs) { wxString attr = *attrs++; - if (!*(char*)attr) + if (attr.IsEmpty()) break; wxString value = *attrs++; --- audacity-src-2.0.5/src/TrackPanel.cpp.org 2014-01-15 20:40:41.349305322 +0100 +++ audacity-src-2.0.5/src/TrackPanel.cpp 2014-01-15 20:44:35.530549708 +0100 @@ -5097,7 +5097,7 @@ // The activate event is used to make the // parent window 'come alive' if it didn't have focus. wxActivateEvent e; - GetParent()->ProcessEvent(e); + GetParent()->GetEventHandler()->ProcessEvent(e); // wxTimers seem to be a little unreliable, so this // "primes" it to make sure it keeps going for a while... @@ -5534,7 +5534,7 @@ int trackKind = pTrack->GetKind(); currentTool = selectTool; // the default. - if( event.ButtonIsDown(3) || event.RightUp()){ + if( event.ButtonIsDown((wxMouseButton)3) || event.RightUp()){ currentTool = zoomTool; } else if( trackKind == Track::Time ){ currentTool = envelopeTool; @@ -8251,7 +8251,7 @@ mSliderOffset = 0; int fontSize = 10; - mFont.Create(fontSize, wxSWISS, wxNORMAL, wxNORMAL); + mFont.Create(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); int allowableWidth = GetTrackInfoWidth() - 2; // 2 to allow for left/right borders int textWidth, textHeight; --- audacity-src-2.0.5/src/UploadDialog.cpp.org 2014-01-15 21:26:09.207158042 +0100 +++ audacity-src-2.0.5/src/UploadDialog.cpp 2014-01-15 21:36:01.093744587 +0100 @@ -113,12 +113,12 @@ icons->Add(*mp3Icon); icons->Add(*upIcon); - wxFlexGridSizer *topSizer = new wxFlexGridSizer(2, 1); + wxFlexGridSizer *topSizer = new wxFlexGridSizer(2, 1, wxSize(5, 5)); wxStaticBoxSizer *connectionBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("FTP Connection"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL); wxStaticBoxSizer *fileBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("File Manager"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL); wxStaticBoxSizer *siteBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("Site Manager"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL); - wxFlexGridSizer *connectionSizer = new wxFlexGridSizer(2, 4); + wxFlexGridSizer *connectionSizer = new wxFlexGridSizer(2, 4, wxSize(5, 5)); wxBoxSizer *leftSizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *rightSizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *fileButtonSizer = new wxBoxSizer(wxHORIZONTAL); --- audacity-src-2.0.5/src/commands/ScriptCommandRelay.cpp~ 2013-10-19 09:31:52.000000000 +0200 +++ audacity-src-2.0.5/src/commands/ScriptCommandRelay.cpp 2014-01-15 21:38:44.739235286 +0100 @@ -57,7 +57,7 @@ wxASSERT(cmd != NULL); AppCommandEvent ev; ev.SetCommand(cmd); - project->AddPendingEvent(ev); + project->GetEventHandler()->AddPendingEvent(ev); } /// This is the function which actually obeys one command. Rather than applying --- audacity-src-2.0.5/src/effects/BassTreble.cpp~ 2014-01-15 21:52:07.000000000 +0100 +++ audacity-src-2.0.5/src/effects/BassTreble.cpp 2014-01-15 21:54:22.387472634 +0100 @@ -35,6 +35,7 @@ #include #include #include +#include // Used to communicate the type of the filter. static const int bassType = 0; //Low Shelf --- audacity-src-2.0.5/src/effects/Compressor.cpp~ 2013-10-19 09:31:50.000000000 +0200 +++ audacity-src-2.0.5/src/effects/Compressor.cpp 2014-01-15 21:56:28.328381464 +0100 @@ -39,6 +39,7 @@ #include #include #include +#include #include "Compressor.h" #include "../ShuttleGui.h" --- audacity-src-2.0.5/src/import/ImportRaw.cpp~ 2013-10-19 09:31:52.000000000 +0200 +++ audacity-src-2.0.5/src/import/ImportRaw.cpp 2014-01-15 22:08:33.731103084 +0100 @@ -324,7 +324,7 @@ if (sf_format_check(&info)) { mEncodingSubtype[mNumEncodings] = subtype; - encodings.Add(LAT1CTOWX(sf_encoding_index_name(i))); + encodings.Add(sf_encoding_index_name(i)); if ((mEncoding & SF_FORMAT_SUBMASK) == subtype) selection = mNumEncodings; --- audacity-src-2.0.5/src/ondemand/ODManager.cpp~ 2013-10-19 09:31:48.000000000 +0200 +++ audacity-src-2.0.5/src/ondemand/ODManager.cpp 2014-01-15 22:09:57.850563760 +0100 @@ -311,7 +311,7 @@ AudacityProject::AllProjectsDeleteLock(); AudacityProject* proj = GetActiveProject(); if(proj) - proj->AddPendingEvent( event ); + proj->GetEventHandler()->AddPendingEvent( event ); AudacityProject::AllProjectsDeleteUnlock(); } mTerminateMutex.Lock(); --- audacity-src-2.0.5/src/ondemand/ODTask.cpp~ 2013-10-19 09:31:48.000000000 +0200 +++ audacity-src-2.0.5/src/ondemand/ODTask.cpp 2014-01-15 22:10:33.568417325 +0100 @@ -158,7 +158,7 @@ if(IsTaskAssociatedWithProject(gAudacityProjects[i])) { //this assumes tasks are only associated with one project. - gAudacityProjects[i]->AddPendingEvent( event ); + gAudacityProjects[i]->GetEventHandler()->AddPendingEvent( event ); //mark the changes so that the project can be resaved. gAudacityProjects[i]->GetUndoManager()->SetODChangesFlag(); break; --- audacity-src-2.0.5/src/prefs/KeyConfigPrefs.cpp~ 2013-10-19 09:31:49.000000000 +0200 +++ audacity-src-2.0.5/src/prefs/KeyConfigPrefs.cpp 2014-01-15 22:11:54.407771374 +0100 @@ -992,7 +992,7 @@ nevent.SetDirection(!e.ShiftDown()); nevent.SetEventObject(t); nevent.SetCurrentFocus(t); - t->GetParent()->ProcessEvent(nevent); + t->GetParent()->GetEventHandler()->ProcessEvent(nevent); return; } --- audacity-src-2.0.5/src/toolbars/ToolsToolBar.cpp.org 2014-01-15 22:28:18.141940638 +0100 +++ audacity-src-2.0.5/src/toolbars/ToolsToolBar.cpp 2014-01-15 22:28:19.835329870 +0100 @@ -61,16 +61,16 @@ // These MUST be in the same order as the ids above. static const wxChar * MessageOfTool[numTools] = { wxTRANSLATE((wxChar *)"Click and drag to select audio"), - wxTRANSLATE("Click and drag to edit the amplitude envelope"), - wxTRANSLATE("Click and drag to edit the samples"), + wxTRANSLATE((wxChar *)"Click and drag to edit the amplitude envelope"), + wxTRANSLATE((wxChar *)"Click and drag to edit the samples"), #if defined( __WXMAC__ ) wxTRANSLATE("Click to Zoom In, Shift-Click to Zoom Out"), #elif defined( __WXMSW__ ) wxTRANSLATE("Drag to Zoom Into Region, Right-Click to Zoom Out"), #elif defined( __WXGTK__ ) - wxTRANSLATE("Left=Zoom In, Right=Zoom Out, Middle=Normal"), + wxTRANSLATE((wxChar *)"Left=Zoom In, Right=Zoom Out, Middle=Normal"), #endif - wxTRANSLATE("Click and drag to move a track in time"), + wxTRANSLATE((wxChar *)"Click and drag to move a track in time"), wxT("") // multi-mode tool };