audacity-wx.patch

   1 --- audacity-src-2.0.5/configure.in~    2013-10-19 09:31:48.000000000 +0200
   2 +++ audacity-src-2.0.5/configure.in     2014-01-15 14:33:23.736199148 +0100
   3 @@ -294,7 +294,7 @@
   4  AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x])
   5
   6  case "${wx_version}" in
   7 -  2.8.*)
   8 +  2.8.*|3.0.*)
   9      echo "Great, you're using wxWidgets ${wx_version}!"
  10      ;;
  11    *)
  12 --- audacity-src-2.0.5/lib-src/lib-widget-extra/configure.in~   2013-10-19 09:31:34.000000000 +0200
  13 +++ audacity-src-2.0.5/lib-src/lib-widget-extra/configure.in    2014-01-15 14:35:09.519583138 +0100
  14 @@ -142,7 +142,7 @@
  15  AC_MSG_NOTICE([Checking that the chosen version of wxWidgets is 2.8.x])
  16
  17  case "${wx_version}" in
  18 -  2.8.*)
  19 +  2.8.*|3.0.*)
  20      echo "Great, you're using wxWidgets ${wx_version}!"
  21      ;;
  22    *)
  23 --- audacity-src-2.0.5/lib-src/FileDialog/FileDialog.h~ 2013-10-19 09:31:33.000000000 +0200
  24 +++ audacity-src-2.0.5/lib-src/FileDialog/FileDialog.h  2014-01-15 14:48:35.805376488 +0100
  25 @@ -55,11 +55,11 @@
  26  //----------------------------------------------------------------------------
  27
  28  wxString
  29 -FileSelector(const wxChar *message = wxFileSelectorPromptStr,
  30 +FileSelector(const wxChar *message = (wxChar *)wxFileSelectorPromptStr,
  31               const wxChar *default_path = NULL,
  32               const wxChar *default_filename = NULL,
  33               const wxChar *default_extension = NULL,
  34 -             const wxChar *wildcard = wxFileSelectorDefaultWildcardStr,
  35 +             const wxChar *wildcard = (wxChar *)wxFileSelectorDefaultWildcardStr,
  36               int flags = 0,
  37               wxWindow *parent = NULL,
  38               wxString label = wxEmptyString,
  39 --- audacity-src-2.0.5/lib-src/FileDialog/gtk/FileDialogPrivate.cpp     2014-01-15 18:42:47.255235243 +0100
  40 +++ audacity-src-2.0.5/lib-src/FileDialog/gtk/FileDialogPrivate.cpp.org 2014-01-15 18:42:42.785091188 +0100
  41 @@ -18,13 +18,17 @@
  42
  43  #include "../FileDialog.h"
  44
  45 -#if defined(__WXGTK24__) && (!defined(__WXGPE__))
  46 +
  47 +
  48 +
  49 +#if 1
  50
  51  #include <gtk/gtk.h>
  52  #include "private.h"
  53
  54  #include <unistd.h> // chdir
  55
  56 +#include "wx/defs.h"
  57  #include "wx/intl.h"
  58  #include "wx/filename.h" // wxFilename
  59  #include "wx/tokenzr.h" // wxStringTokenizer
  60 @@ -299,7 +303,7 @@
  61           EndModal(wxID_OK);
  62     } else
  63  #endif
  64 -      wxGenericFileDialog::OnListOk( event );
  65 +      wxGenericFileDialog::OnOk( event );
  66  }
  67
  68  int FileDialog::ShowModal()
  69 --- audacity-src-2.0.5/src/Sequence.cpp.org     2014-01-15 18:46:25.845608473 +0100
  70 +++ audacity-src-2.0.5/src/Sequence.cpp 2014-01-15 18:54:18.464160530 +0100
  71 @@ -1034,8 +1034,8 @@
  72                 _("Sequence has block file with length %s > mMaxSamples %s.\nTruncating to mMaxSamples."),
  73                 Internat::ToString(((wxLongLong)(bb->f->GetLength())).ToDouble(), 0).c_str(),
  74                 Internat::ToString(((wxLongLong)mMaxSamples).ToDouble(), 0).c_str());
  75 -         ::wxMessageBox(sMsg, _("Warning - Length in Writing Sequence"), wxICON_EXCLAMATION | wxOK);
  76 -         ::wxLogWarning(sMsg);
  77 +         wxMessageBox(sMsg, _("Warning - Length in Writing Sequence"), wxICON_EXCLAMATION | wxOK);
  78 +         wxLogWarning(sMsg);
  79           bb->f->SetLength(mMaxSamples);
  80        }
  81
  82 --- audacity-src-2.0.5/src/AudacityApp.cpp.org  2014-01-15 18:55:56.667324154 +0100
  83 +++ audacity-src-2.0.5/src/AudacityApp.cpp      2014-01-15 19:35:30.704368875 +0100
  84 @@ -1324,7 +1324,7 @@
  85           }
  86
  87           if (option < argc - 1 &&
  88 -             argv[option + 1] &&
  89 +             !argv[option + 1].IsEmpty() &&
  90               !wxString(wxT("-blocksize")).CmpNoCase(argv[option])) {
  91              long theBlockSize;
  92              if (wxString(argv[option + 1]).ToLong(&theBlockSize)) {
  93 --- audacity-src-2.0.5/src/AudioIO.cpp~ 2013-10-19 09:31:48.000000000 +0200
  94 +++ audacity-src-2.0.5/src/AudioIO.cpp  2014-01-15 19:36:45.000091144 +0100
  95 @@ -561,7 +561,7 @@
  96        wxString errStr = _("Could not find any audio devices.\n");
  97        errStr += _("You will not be able to play or record audio.\n\n");
  98        wxString paErrStr = LAT1CTOWX(Pa_GetErrorText(err));
  99 -      if (paErrStr)
 100 +      if (!paErrStr.IsEmpty())
 101           errStr += _("Error: ")+paErrStr;
 102        // XXX: we are in libaudacity, popping up dialogs not allowed!  A
 103        // long-term solution will probably involve exceptions
 104 --- audacity-src-2.0.5/src/CaptureEvents.cpp~   2013-10-19 09:31:48.000000000 +0200
 105 +++ audacity-src-2.0.5/src/CaptureEvents.cpp    2014-01-15 19:45:04.053070193 +0100
 106 @@ -76,8 +76,6 @@
 107     // temporarily replace the global GDK event handler with our function
 108     gdk_event_handler_set((GdkEventFunc)main_do_event, &queue, NULL);
 109
 110 -   // temporarily suspend idle callbacks
 111 -   wxTheApp->SuspendIdleCallback();
 112  }
 113
 114  CaptureEvents::~CaptureEvents()
 115 --- audacity-src-2.0.5/src/CaptureEvents.cpp~   2014-01-15 19:45:04.000000000 +0100
 116 +++ audacity-src-2.0.5/src/CaptureEvents.cpp    2014-01-15 19:45:45.754464727 +0100
 117 @@ -59,9 +59,6 @@
 118        break;
 119     }
 120
 121 -   // don't allow idle callbacks while we're active
 122 -   wxTheApp->SuspendIdleCallback();
 123 -
 124     return;
 125  }
 126
 127 --- audacity-src-2.0.5/src/LyricsWindow.cpp~    2013-10-19 09:31:49.000000000 +0200
 128 +++ audacity-src-2.0.5/src/LyricsWindow.cpp     2014-01-15 19:51:24.312324357 +0100
 129 @@ -72,7 +72,7 @@
 130        #else
 131           wxIcon ic(wxICON(AudacityLogo48x48));
 132        #endif
 133 -      SetIcon(ic);
 134 +      SetIcon((const wxIcon&)ic);
 135     #endif
 136
 137     wxPoint panelPos(0, 0);
 138 --- audacity-src-2.0.5/src/Menus.cpp~   2013-10-19 09:31:48.000000000 +0200
 139 +++ audacity-src-2.0.5/src/Menus.cpp    2014-01-15 19:55:08.146305162 +0100
 140 @@ -2403,7 +2403,7 @@
 141     //       The workaround is to queue a context menu event, allowing the key press
 142     //       event to complete.
 143     wxContextMenuEvent e(wxEVT_CONTEXT_MENU, GetId());
 144 -   mTrackPanel->AddPendingEvent(e);
 145 +   mTrackPanel->GetEventHandler()->AddPendingEvent(e);
 146  }
 147
 148  void AudacityProject::OnTrackMute()
 149 --- audacity-src-2.0.5/src/MixerBoard.cpp.org   2014-01-15 19:56:40.262635794 +0100
 150 +++ audacity-src-2.0.5/src/MixerBoard.cpp       2014-01-15 19:56:59.606597792 +0100
 151 @@ -1727,7 +1727,7 @@
 152        #else
 153           wxIcon ic(wxICON(AudacityLogo48x48));
 154        #endif
 155 -      SetIcon(ic);
 156 +      SetIcon((const wxIcon&)ic);
 157     #endif
 158  }
 159
 160 --- audacity-src-2.0.5/src/PitchName.cpp.org    2014-01-15 19:58:21.012574229 +0100
 161 +++ audacity-src-2.0.5/src/PitchName.cpp        2014-01-15 20:07:39.509684788 +0100
 162 @@ -20,6 +20,12 @@
 163  #include <math.h>
 164  #include <stdio.h>
 165
 166 +#include "wx/defs.h"
 167 +#include "wx/dlimpexp.h"
 168 +#include "wx/wxcrtbase.h"
 169 +#include "wx/wxcrtvararg.h"
 170 +#include "wx/wxcrt.h"
 171 +
 172  #include "PitchName.h"
 173
 174
 175 --- audacity-src-2.0.5/src/PlatformCompatibility.cpp.org        2014-01-15 20:31:30.447274594 +0100
 176 +++ audacity-src-2.0.5/src/PlatformCompatibility.cpp    2014-01-15 20:31:50.037920878 +0100
 177 @@ -37,9 +37,8 @@
 178     static wxString path;
 179
 180     if (!found) {
 181 -      wxStandardPaths std;
 182
 183 -      path = std.GetExecutablePath();
 184 +      path = wxStandardPaths::Get().GetExecutablePath();
 185
 186        found = true;
 187     }
 188 @@ -65,4 +64,4 @@
 189  #else
 190     return filePath;
 191  #endif
 192 -}
 193 \ Brak znaku nowej linii na końcu pliku
 194 +}
 195 --- audacity-src-2.0.5/src/Profiler.cpp~        2013-10-19 09:31:49.000000000 +0200
 196 +++ audacity-src-2.0.5/src/Profiler.cpp 2014-01-15 20:32:39.369547031 +0100
 197 @@ -20,6 +20,9 @@
 198
 199  *//*******************************************************************/
 200
 201 +#include <stdio.h>
 202 +#include <string.h>
 203 +
 204  #include "Profiler.h"
 205
 206  ///write to a profile at the end of the test.
 207 @@ -165,4 +168,4 @@
 208     else
 209        return 0.0;
 210  }
 211 -
 212 \ Brak znaku nowej linii na końcu pliku
 213 +
 214 --- audacity-src-2.0.5/src/Project.cpp~ 2014-01-15 20:34:38.000000000 +0100
 215 +++ audacity-src-2.0.5/src/Project.cpp  2014-01-15 20:35:31.352033096 +0100
 216 @@ -988,7 +988,7 @@
 217        wxIcon ic;
 218        ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48));
 219     #endif
 220 -   SetIcon(ic);
 221 +   SetIcon((const wxIcon&)ic);
 222  #endif
 223     mIconized = false;
 224
 225 --- audacity-src-2.0.5/src/Tags.cpp~    2014-01-15 20:37:40.000000000 +0100
 226 +++ audacity-src-2.0.5/src/Tags.cpp     2014-01-15 20:38:32.374915880 +0100
 227 @@ -482,7 +482,7 @@
 228
 229        while (*attrs) {
 230           wxString attr = *attrs++;
 231 -         if (!*(char*)attr)
 232 +         if (attr.IsEmpty())
 233              break;
 234           wxString value = *attrs++;
 235
 236 --- audacity-src-2.0.5/src/TrackPanel.cpp.org   2014-01-15 20:40:41.349305322 +0100
 237 +++ audacity-src-2.0.5/src/TrackPanel.cpp       2014-01-15 20:44:35.530549708 +0100
 238 @@ -5097,7 +5097,7 @@
 239        // The activate event is used to make the
 240        // parent window 'come alive' if it didn't have focus.
 241        wxActivateEvent e;
 242 -      GetParent()->ProcessEvent(e);
 243 +      GetParent()->GetEventHandler()->ProcessEvent(e);
 244
 245        // wxTimers seem to be a little unreliable, so this
 246        // "primes" it to make sure it keeps going for a while...
 247 @@ -5534,7 +5534,7 @@
 248     int trackKind = pTrack->GetKind();
 249     currentTool = selectTool; // the default.
 250
 251 -   if( event.ButtonIsDown(3) || event.RightUp()){
 252 +   if( event.ButtonIsDown((wxMouseButton)3) || event.RightUp()){
 253        currentTool = zoomTool;
 254     } else if( trackKind == Track::Time ){
 255        currentTool = envelopeTool;
 256 @@ -8251,7 +8251,7 @@
 257     mSliderOffset = 0;
 258
 259     int fontSize = 10;
 260 -   mFont.Create(fontSize, wxSWISS, wxNORMAL, wxNORMAL);
 261 +   mFont.Create(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
 262
 263     int allowableWidth = GetTrackInfoWidth() - 2; // 2 to allow for left/right borders
 264     int textWidth, textHeight;
 265 --- audacity-src-2.0.5/src/UploadDialog.cpp.org 2014-01-15 21:26:09.207158042 +0100
 266 +++ audacity-src-2.0.5/src/UploadDialog.cpp     2014-01-15 21:36:01.093744587 +0100
 267 @@ -113,12 +113,12 @@
 268      icons->Add(*mp3Icon);
 269      icons->Add(*upIcon);
 270
 271 -    wxFlexGridSizer *topSizer = new wxFlexGridSizer(2, 1);
 272 +    wxFlexGridSizer *topSizer = new wxFlexGridSizer(2, 1, wxSize(5, 5));
 273      wxStaticBoxSizer *connectionBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("FTP Connection"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL);
 274      wxStaticBoxSizer *fileBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("File Manager"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL);
 275      wxStaticBoxSizer *siteBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("Site Manager"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL);
 276
 277 -    wxFlexGridSizer *connectionSizer = new wxFlexGridSizer(2, 4);
 278 +    wxFlexGridSizer *connectionSizer = new wxFlexGridSizer(2, 4, wxSize(5, 5));
 279      wxBoxSizer *leftSizer = new wxBoxSizer(wxVERTICAL);
 280      wxBoxSizer *rightSizer = new wxBoxSizer(wxVERTICAL);
 281      wxBoxSizer *fileButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 282 --- audacity-src-2.0.5/src/commands/ScriptCommandRelay.cpp~     2013-10-19 09:31:52.000000000 +0200
 283 +++ audacity-src-2.0.5/src/commands/ScriptCommandRelay.cpp      2014-01-15 21:38:44.739235286 +0100
 284 @@ -57,7 +57,7 @@
 285     wxASSERT(cmd != NULL);
 286     AppCommandEvent ev;
 287     ev.SetCommand(cmd);
 288 -   project->AddPendingEvent(ev);
 289 +   project->GetEventHandler()->AddPendingEvent(ev);
 290  }
 291
 292  /// This is the function which actually obeys one command.  Rather than applying
 293 --- audacity-src-2.0.5/src/effects/BassTreble.cpp~      2014-01-15 21:52:07.000000000 +0100
 294 +++ audacity-src-2.0.5/src/effects/BassTreble.cpp       2014-01-15 21:54:22.387472634 +0100
 295 @@ -35,6 +35,7 @@
 296  #include <wx/checkbox.h>
 297  #include <wx/slider.h>
 298  #include <wx/sizer.h>
 299 +#include <wx/textctrl.h>
 300
 301  // Used to communicate the type of the filter.
 302  static const int bassType = 0; //Low Shelf
 303 --- audacity-src-2.0.5/src/effects/Compressor.cpp~      2013-10-19 09:31:50.000000000 +0200
 304 +++ audacity-src-2.0.5/src/effects/Compressor.cpp       2014-01-15 21:56:28.328381464 +0100
 305 @@ -39,6 +39,7 @@
 306  #include <wx/brush.h>
 307  #include <wx/image.h>
 308  #include <wx/dcmemory.h>
 309 +#include <wx/dcclient.h>
 310
 311  #include "Compressor.h"
 312  #include "../ShuttleGui.h"
 313 --- audacity-src-2.0.5/src/import/ImportRaw.cpp~        2013-10-19 09:31:52.000000000 +0200
 314 +++ audacity-src-2.0.5/src/import/ImportRaw.cpp 2014-01-15 22:08:33.731103084 +0100
 315 @@ -324,7 +324,7 @@
 316
 317        if (sf_format_check(&info)) {
 318           mEncodingSubtype[mNumEncodings] = subtype;
 319 -         encodings.Add(LAT1CTOWX(sf_encoding_index_name(i)));
 320 +         encodings.Add(sf_encoding_index_name(i));
 321
 322           if ((mEncoding & SF_FORMAT_SUBMASK) == subtype)
 323              selection = mNumEncodings;
 324 --- audacity-src-2.0.5/src/ondemand/ODManager.cpp~      2013-10-19 09:31:48.000000000 +0200
 325 +++ audacity-src-2.0.5/src/ondemand/ODManager.cpp       2014-01-15 22:09:57.850563760 +0100
 326 @@ -311,7 +311,7 @@
 327           AudacityProject::AllProjectsDeleteLock();
 328           AudacityProject* proj = GetActiveProject();
 329           if(proj)
 330 -            proj->AddPendingEvent( event );
 331 +            proj->GetEventHandler()->AddPendingEvent( event );
 332           AudacityProject::AllProjectsDeleteUnlock();
 333        }
 334        mTerminateMutex.Lock();
 335 --- audacity-src-2.0.5/src/ondemand/ODTask.cpp~ 2013-10-19 09:31:48.000000000 +0200
 336 +++ audacity-src-2.0.5/src/ondemand/ODTask.cpp  2014-01-15 22:10:33.568417325 +0100
 337 @@ -158,7 +158,7 @@
 338           if(IsTaskAssociatedWithProject(gAudacityProjects[i]))
 339           {
 340              //this assumes tasks are only associated with one project.
 341 -            gAudacityProjects[i]->AddPendingEvent( event );
 342 +            gAudacityProjects[i]->GetEventHandler()->AddPendingEvent( event );
 343              //mark the changes so that the project can be resaved.
 344              gAudacityProjects[i]->GetUndoManager()->SetODChangesFlag();
 345              break;
 346 --- audacity-src-2.0.5/src/prefs/KeyConfigPrefs.cpp~    2013-10-19 09:31:49.000000000 +0200
 347 +++ audacity-src-2.0.5/src/prefs/KeyConfigPrefs.cpp     2014-01-15 22:11:54.407771374 +0100
 348 @@ -992,7 +992,7 @@
 349        nevent.SetDirection(!e.ShiftDown());
 350        nevent.SetEventObject(t);
 351        nevent.SetCurrentFocus(t);
 352 -      t->GetParent()->ProcessEvent(nevent);
 353 +      t->GetParent()->GetEventHandler()->ProcessEvent(nevent);
 354
 355        return;
 356     }
 357 --- audacity-src-2.0.5/src/toolbars/ToolsToolBar.cpp.org        2014-01-15 22:28:18.141940638 +0100
 358 +++ audacity-src-2.0.5/src/toolbars/ToolsToolBar.cpp    2014-01-15 22:28:19.835329870 +0100
 359 @@ -61,16 +61,16 @@
 360  // These MUST be in the same order as the ids above.
 361  static const wxChar * MessageOfTool[numTools] = {
 362     wxTRANSLATE((wxChar *)"Click and drag to select audio"),
 363 -   wxTRANSLATE("Click and drag to edit the amplitude envelope"),
 364 -   wxTRANSLATE("Click and drag to edit the samples"),
 365 +   wxTRANSLATE((wxChar *)"Click and drag to edit the amplitude envelope"),
 366 +   wxTRANSLATE((wxChar *)"Click and drag to edit the samples"),
 367  #if defined( __WXMAC__ )
 368     wxTRANSLATE("Click to Zoom In, Shift-Click to Zoom Out"),
 369  #elif defined( __WXMSW__ )
 370     wxTRANSLATE("Drag to Zoom Into Region, Right-Click to Zoom Out"),
 371  #elif defined( __WXGTK__ )
 372 -   wxTRANSLATE("Left=Zoom In, Right=Zoom Out, Middle=Normal"),
 373 +   wxTRANSLATE((wxChar *)"Left=Zoom In, Right=Zoom Out, Middle=Normal"),
 374  #endif
 375 -   wxTRANSLATE("Click and drag to move a track in time"),
 376 +   wxTRANSLATE((wxChar *)"Click and drag to move a track in time"),
 377     wxT("") // multi-mode tool
 378  };
 379