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 = (const 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 = (const 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 != wxEmptyString)
 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/Menus.cpp~   2013-10-19 09:31:48.000000000 +0200
 128 +++ audacity-src-2.0.5/src/Menus.cpp    2014-01-15 19:55:08.146305162 +0100
 129 @@ -2403,7 +2403,7 @@
 130     //       The workaround is to queue a context menu event, allowing the key press
 131     //       event to complete.
 132     wxContextMenuEvent e(wxEVT_CONTEXT_MENU, GetId());
 133 -   mTrackPanel->AddPendingEvent(e);
 134 +   mTrackPanel->GetEventHandler()->AddPendingEvent(e);
 135  }
 136
 137  void AudacityProject::OnTrackMute()
 138 --- audacity-src-2.0.5/src/PitchName.cpp.org    2014-01-15 19:58:21.012574229 +0100
 139 +++ audacity-src-2.0.5/src/PitchName.cpp        2014-01-15 20:07:39.509684788 +0100
 140 @@ -20,6 +20,12 @@
 141  #include <math.h>
 142  #include <stdio.h>
 143
 144 +#include "wx/defs.h"
 145 +#include "wx/dlimpexp.h"
 146 +#include "wx/wxcrtbase.h"
 147 +#include "wx/wxcrtvararg.h"
 148 +#include "wx/wxcrt.h"
 149 +
 150  #include "PitchName.h"
 151
 152
 153 --- audacity-src-2.0.5/src/PlatformCompatibility.cpp.org        2014-01-15 20:31:30.447274594 +0100
 154 +++ audacity-src-2.0.5/src/PlatformCompatibility.cpp    2014-01-15 20:31:50.037920878 +0100
 155 @@ -37,9 +37,8 @@
 156     static wxString path;
 157
 158     if (!found) {
 159 -      wxStandardPaths std;
 160
 161 -      path = std.GetExecutablePath();
 162 +      path = wxStandardPaths::Get().GetExecutablePath();
 163
 164        found = true;
 165     }
 166 @@ -65,4 +64,4 @@
 167  #else
 168     return filePath;
 169  #endif
 170 -}
 171 \ Brak znaku nowej linii na końcu pliku
 172 +}
 173 --- audacity-src-2.0.5/src/Profiler.cpp~        2013-10-19 09:31:49.000000000 +0200
 174 +++ audacity-src-2.0.5/src/Profiler.cpp 2014-01-15 20:32:39.369547031 +0100
 175 @@ -20,6 +20,9 @@
 176
 177  *//*******************************************************************/
 178
 179 +#include <stdio.h>
 180 +#include <string.h>
 181 +
 182  #include "Profiler.h"
 183
 184  ///write to a profile at the end of the test.
 185 @@ -165,4 +168,4 @@
 186     else
 187        return 0.0;
 188  }
 189 -
 190 \ Brak znaku nowej linii na końcu pliku
 191 +
 192 --- audacity-src-2.0.5/src/Project.cpp~ 2014-01-15 20:34:38.000000000 +0100
 193 +++ audacity-src-2.0.5/src/Project.cpp  2014-01-15 20:35:31.352033096 +0100
 194 @@ -1675,7 +1675,7 @@
 195        wxCommandEvent e(EVT_CAPTURE_KEY);
 196        e.SetEventObject(&event);
 197
 198 -      if (w->ProcessEvent(e)) {
 199 +      if (w->ProcessWindowEvent(e)) {
 200           return false;
 201        }
 202     }
 203 --- audacity-src-2.0.5/src/TrackPanel.cpp.org   2014-01-15 20:40:41.349305322 +0100
 204 +++ audacity-src-2.0.5/src/TrackPanel.cpp       2014-01-15 20:44:35.530549708 +0100
 205 @@ -5097,7 +5097,7 @@
 206        // The activate event is used to make the
 207        // parent window 'come alive' if it didn't have focus.
 208        wxActivateEvent e;
 209 -      GetParent()->ProcessEvent(e);
 210 +      GetParent()->GetEventHandler()->ProcessEvent(e);
 211
 212        // wxTimers seem to be a little unreliable, so this
 213        // "primes" it to make sure it keeps going for a while...
 214 @@ -5534,7 +5534,7 @@
 215     int trackKind = pTrack->GetKind();
 216     currentTool = selectTool; // the default.
 217
 218 -   if( event.ButtonIsDown(3) || event.RightUp()){
 219 +   if( event.ButtonIsDown((wxMouseButton)3) || event.RightUp()){
 220        currentTool = zoomTool;
 221     } else if( trackKind == Track::Time ){
 222        currentTool = envelopeTool;
 223 @@ -8251,7 +8251,7 @@
 224     mSliderOffset = 0;
 225
 226     int fontSize = 10;
 227 -   mFont.Create(fontSize, wxSWISS, wxNORMAL, wxNORMAL);
 228 +   mFont.Create(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
 229
 230     int allowableWidth = GetTrackInfoWidth() - 2; // 2 to allow for left/right borders
 231     int textWidth, textHeight;
 232 --- audacity-src-2.0.5/src/UploadDialog.cpp.org 2014-01-15 21:26:09.207158042 +0100
 233 +++ audacity-src-2.0.5/src/UploadDialog.cpp     2014-01-15 21:36:01.093744587 +0100
 234 @@ -113,12 +113,12 @@
 235      icons->Add(*mp3Icon);
 236      icons->Add(*upIcon);
 237
 238 -    wxFlexGridSizer *topSizer = new wxFlexGridSizer(2, 1);
 239 +    wxFlexGridSizer *topSizer = new wxFlexGridSizer(2, 1, 0);
 240      wxStaticBoxSizer *connectionBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("FTP Connection"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL);
 241      wxStaticBoxSizer *fileBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("File Manager"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL);
 242      wxStaticBoxSizer *siteBox = new wxStaticBoxSizer(new wxStaticBox(this, -1, wxT("Site Manager"), wxDefaultPosition, wxDefaultSize, 0, wxT("")), wxVERTICAL);
 243
 244 -    wxFlexGridSizer *connectionSizer = new wxFlexGridSizer(2, 4);
 245 +    wxFlexGridSizer *connectionSizer = new wxFlexGridSizer(2, 4, 0);
 246      wxBoxSizer *leftSizer = new wxBoxSizer(wxVERTICAL);
 247      wxBoxSizer *rightSizer = new wxBoxSizer(wxVERTICAL);
 248      wxBoxSizer *fileButtonSizer = new wxBoxSizer(wxHORIZONTAL);
 249 --- audacity-src-2.0.5/src/commands/ScriptCommandRelay.cpp~     2013-10-19 09:31:52.000000000 +0200
 250 +++ audacity-src-2.0.5/src/commands/ScriptCommandRelay.cpp      2014-01-15 21:38:44.739235286 +0100
 251 @@ -57,7 +57,7 @@
 252     wxASSERT(cmd != NULL);
 253     AppCommandEvent ev;
 254     ev.SetCommand(cmd);
 255 -   project->AddPendingEvent(ev);
 256 +   project->GetEventHandler()->AddPendingEvent(ev);
 257  }
 258
 259  /// This is the function which actually obeys one command.  Rather than applying
 260 --- audacity-src-2.0.5/src/effects/BassTreble.cpp~      2014-01-15 21:52:07.000000000 +0100
 261 +++ audacity-src-2.0.5/src/effects/BassTreble.cpp       2014-01-15 21:54:22.387472634 +0100
 262 @@ -35,6 +35,7 @@
 263  #include <wx/checkbox.h>
 264  #include <wx/slider.h>
 265  #include <wx/sizer.h>
 266 +#include <wx/textctrl.h>
 267
 268  // Used to communicate the type of the filter.
 269  static const int bassType = 0; //Low Shelf
 270 --- audacity-src-2.0.5/src/effects/Compressor.cpp~      2013-10-19 09:31:50.000000000 +0200
 271 +++ audacity-src-2.0.5/src/effects/Compressor.cpp       2014-01-15 21:56:28.328381464 +0100
 272 @@ -39,6 +39,7 @@
 273  #include <wx/brush.h>
 274  #include <wx/image.h>
 275  #include <wx/dcmemory.h>
 276 +#include <wx/dcclient.h>
 277
 278  #include "Compressor.h"
 279  #include "../ShuttleGui.h"
 280 --- audacity-src-2.0.5/src/import/ImportRaw.cpp~        2013-10-19 09:31:52.000000000 +0200
 281 +++ audacity-src-2.0.5/src/import/ImportRaw.cpp 2014-01-15 22:08:33.731103084 +0100
 282 @@ -324,7 +324,7 @@
 283
 284        if (sf_format_check(&info)) {
 285           mEncodingSubtype[mNumEncodings] = subtype;
 286 -         encodings.Add(LAT1CTOWX(sf_encoding_index_name(i)));
 287 +         encodings.Add(wxString (sf_encoding_index_name(i).wc_str(), wxConvISO8859_1));
 288
 289           if ((mEncoding & SF_FORMAT_SUBMASK) == subtype)
 290              selection = mNumEncodings;
 291 --- audacity-src-2.0.5/src/ondemand/ODManager.cpp~      2013-10-19 09:31:48.000000000 +0200
 292 +++ audacity-src-2.0.5/src/ondemand/ODManager.cpp       2014-01-15 22:09:57.850563760 +0100
 293 @@ -311,7 +311,7 @@
 294           AudacityProject::AllProjectsDeleteLock();
 295           AudacityProject* proj = GetActiveProject();
 296           if(proj)
 297 -            proj->AddPendingEvent( event );
 298 +            proj->GetEventHandler()->AddPendingEvent( event );
 299           AudacityProject::AllProjectsDeleteUnlock();
 300        }
 301        mTerminateMutex.Lock();
 302 --- audacity-src-2.0.5/src/ondemand/ODTask.cpp~ 2013-10-19 09:31:48.000000000 +0200
 303 +++ audacity-src-2.0.5/src/ondemand/ODTask.cpp  2014-01-15 22:10:33.568417325 +0100
 304 @@ -158,7 +158,7 @@
 305           if(IsTaskAssociatedWithProject(gAudacityProjects[i]))
 306           {
 307              //this assumes tasks are only associated with one project.
 308 -            gAudacityProjects[i]->AddPendingEvent( event );
 309 +            gAudacityProjects[i]->GetEventHandler()->AddPendingEvent( event );
 310              //mark the changes so that the project can be resaved.
 311              gAudacityProjects[i]->GetUndoManager()->SetODChangesFlag();
 312              break;
 313 --- audacity-src-2.0.5/src/prefs/KeyConfigPrefs.cpp~    2013-10-19 09:31:49.000000000 +0200
 314 +++ audacity-src-2.0.5/src/prefs/KeyConfigPrefs.cpp     2014-01-15 22:11:54.407771374 +0100
 315 @@ -992,7 +992,7 @@
 316        nevent.SetDirection(!e.ShiftDown());
 317        nevent.SetEventObject(t);
 318        nevent.SetCurrentFocus(t);
 319 -      t->GetParent()->ProcessEvent(nevent);
 320 +      t->GetParent()->GetEventHandler()->ProcessEvent(nevent);
 321
 322        return;
 323     }
 324
 325 --- audacity-src-2.0.5/src/Tags.cpp~    2013-10-19 09:31:52.000000000 +0200
 326 +++ audacity-src-2.0.5/src/Tags.cpp     2014-01-18 21:43:27.834969194 +0100
 327 @@ -482,7 +482,7 @@
 328
 329        while (*attrs) {
 330           wxString attr = *attrs++;
 331 -         if (!*attr)
 332 +         if (attr.IsEmpty())
 333              break;
 334           wxString value = *attrs++;
 335
 336 --- audacity-src-2.0.5/src/toolbars/DeviceToolBar.cpp~  2013-10-19 09:31:49.000000000 +0200
 337 +++ audacity-src-2.0.5/src/toolbars/DeviceToolBar.cpp   2014-01-18 21:53:51.332343784 +0100
 338 @@ -70,10 +70,6 @@
 339  void DeviceToolBar::Create(wxWindow *parent)
 340  {
 341     ToolBar::Create(parent);
 342 -
 343 -   // Simulate a size event to set initial meter placement/size
 344 -   wxSizeEvent dummy;
 345 -   OnSize(dummy);
 346  }
 347
 348  void DeviceToolBar::RecreateTipWindows()
 349 --- audacity-src-2.0.5/src/toolbars/ToolsToolBar.cpp~   2013-10-19 09:31:49.000000000 +0200
 350 +++ audacity-src-2.0.5/src/toolbars/ToolsToolBar.cpp    2014-01-18 21:55:38.645899664 +0100
 351 @@ -59,7 +59,7 @@
 352
 353  // Strings to convert a tool number into a status message
 354  // These MUST be in the same order as the ids above.
 355 -static const wxChar * MessageOfTool[numTools] = {
 356 +static const char * MessageOfTool[numTools] = {
 357     wxTRANSLATE("Click and drag to select audio"),
 358     wxTRANSLATE("Click and drag to edit the amplitude envelope"),
 359     wxTRANSLATE("Click and drag to edit the samples"),
 360 @@ -71,7 +71,7 @@
 361     wxTRANSLATE("Left=Zoom In, Right=Zoom Out, Middle=Normal"),
 362  #endif
 363     wxTRANSLATE("Click and drag to move a track in time"),
 364 -   wxT("") // multi-mode tool
 365 +   "" // multi-mode tool
 366  };
 367
 368  ////////////////////////////////////////////////////////////
 369 --- audacity-src-2.0.5/src/widgets/ImageRoll.h~ 2013-10-19 09:31:50.000000000 +0200
 370 +++ audacity-src-2.0.5/src/widgets/ImageRoll.h  2014-01-18 21:59:51.830959923 +0100
 371 @@ -15,6 +15,7 @@
 372  #include <wx/defs.h>
 373  #include <wx/dynarray.h>
 374  #include <wx/panel.h>
 375 +#include <wx/dc.h>
 376
 377  WX_DECLARE_OBJARRAY(wxBitmap, BitmapArray);
 378  WX_DECLARE_OBJARRAY(wxImage, ImageArray);
 379 @@ -48,7 +49,7 @@
 380   protected:
 381
 382     void DrawBitmap(wxDC &dc, wxBitmap &bitmap,
 383 -                   int x, int y, int logicalFunc = wxCOPY);
 384 +                   int x, int y, wxRasterOperationMode logicalFunc = wxCOPY);
 385
 386     void Init(RollType type, const wxImage &src, wxColour magicColor);
 387
 388 --- audacity-src-2.0.5/src/widgets/ImageRoll.cpp~       2013-10-19 09:31:50.000000000 +0200
 389 +++ audacity-src-2.0.5/src/widgets/ImageRoll.cpp        2014-01-18 22:00:44.529374296 +0100
 390 @@ -100,6 +100,7 @@
 391  #include <wx/bitmap.h>
 392  #include <wx/dcmemory.h>
 393  #include <wx/image.h>
 394 +#include <wx/dcclient.h>
 395
 396  WX_DEFINE_OBJARRAY(BitmapArray);
 397  WX_DEFINE_OBJARRAY(ImageArray);
 398 @@ -299,7 +300,7 @@
 399  }
 400
 401  void ImageRoll::DrawBitmap(wxDC &dc, wxBitmap &bitmap,
 402 -                           int x, int y, int logicalFunc)
 403 +                           int x, int y, wxRasterOperationMode logicalFunc)
 404  {
 405     if (logicalFunc == wxCOPY)
 406        dc.DrawBitmap(bitmap, x, y);
 407 --- audacity-src-2.0.5/src/widgets/ASlider.cpp~ 2013-10-19 09:31:50.000000000 +0200
 408 +++ audacity-src-2.0.5/src/widgets/ASlider.cpp  2014-01-18 22:02:45.678817685 +0100
 409 @@ -1191,7 +1191,7 @@
 410                 nevent.SetDirection( !event.ShiftDown() );
 411                 nevent.SetEventObject( mParent );
 412                 nevent.SetCurrentFocus( mParent );
 413 -               mParent->GetParent()->ProcessEvent( nevent );
 414 +               mParent->GetParent()->ProcessWindowEvent( nevent );
 415              }
 416              break;
 417
 418 @@ -1203,7 +1203,7 @@
 419                 if (def && def->IsEnabled()) {
 420                    wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED,
 421                          def->GetId());
 422 -                  mParent->ProcessEvent(cevent);
 423 +                  mParent->ProcessWindowEvent(cevent);
 424                 }
 425              }
 426
 427 @@ -1228,7 +1228,7 @@
 428     int intValue = (int)( ( mCurrentValue - mMinValue ) * 1000.0f /
 429                           ( mMaxValue - mMinValue ) );
 430     e.SetInt( intValue );
 431 -   mParent->ProcessEvent( e );
 432 +   mParent->ProcessWindowEvent( e );
 433  }
 434
 435  int LWSlider::ValueToPosition(float val)
 436 --- audacity-src-2.0.5/src/widgets/ExpandingToolBar.cpp~        2013-10-19 09:31:50.000000000 +0200
 437 +++ audacity-src-2.0.5/src/widgets/ExpandingToolBar.cpp 2014-01-18 22:11:30.136223627 +0100
 438 @@ -77,6 +77,7 @@
 439  #include <wx/dragimag.h>
 440  #include <wx/arrimpl.cpp>
 441  #include <wx/dialog.h>
 442 +#include <wx/dcclient.h>
 443
 444  #include "ExpandingToolBar.h"
 445  #include "AButton.h"
 446 --- audacity-src-2.0.5/src/widgets/Grabber.cpp~ 2013-10-19 09:31:50.000000000 +0200
 447 +++ audacity-src-2.0.5/src/widgets/Grabber.cpp  2014-01-18 22:12:27.131449284 +0100
 448 @@ -89,7 +89,7 @@
 449     e.SetEventObject(parent);
 450
 451     // Queue the event
 452 -   parent->AddPendingEvent(e);
 453 +   parent->GetEventHandler()->AddPendingEvent(e);
 454  }
 455
 456  //
 457 --- audacity-src-2.0.5/src/widgets/Grid.cpp.org 2014-01-18 22:14:27.708786335 +0100
 458 +++ audacity-src-2.0.5/src/widgets/Grid.cpp     2014-01-18 22:16:29.522831589 +0100
 459 @@ -26,16 +26,18 @@
 460  #include "Grid.h"
 461  #include "TimeTextCtrl.h"
 462
 463 -TimeEditor::TimeEditor()
 464 +TimeEditor::TimeEditor() :
 465 +   mFormat(wxT("seconds")),
 466 +   mRate(44100),
 467 +   mOld(0.0)
 468  {
 469 -   TimeEditor(wxT("seconds"), 44100);
 470  }
 471
 472 -TimeEditor::TimeEditor(const wxString &format, double rate)
 473 +TimeEditor::TimeEditor(const wxString &format, double rate) :
 474 +   mFormat(format),
 475 +   mRate(rate),
 476 +   mOld(0.0)
 477  {
 478 -   mFormat = format;
 479 -   mRate = rate;
 480 -   mOld = 0.0;
 481  }
 482
 483  TimeEditor::~TimeEditor()
 484 @@ -499,7 +501,7 @@
 485              if (def && def->IsEnabled()) {
 486                 wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED,
 487                                       def->GetId());
 488 -               GetParent()->ProcessEvent(cevent);
 489 +               GetParent()->ProcessWindowEvent(cevent);
 490              }
 491           }
 492           else {
 493 --- audacity-src-2.0.5/src/widgets/Grid.h       2014-01-18 22:24:05.184633440 +0100
 494 +++ audacity-src-2.0.5/src/widgets/Grid.h.org   2014-01-18 22:21:44.749968295 +0100
 495 @@ -53,6 +53,9 @@
 496
 497     void BeginEdit(int row, int col, wxGrid *grid);
 498     bool EndEdit(int row, int col, wxGrid *grid);
 499 +   bool EndEdit(int WXUNUSED(row), int WXUNUSED(col), const wxGrid * WXUNUSED(grid),
 500 +       const wxString& WXUNUSED(oldval), wxString * WXUNUSED(newval)) {return false;};
 501 +   void ApplyEdit(int WXUNUSED(row), int WXUNUSED(col), wxGrid* WXUNUSED(grid)) {};
 502
 503     void Reset();
 504
 505 @@ -128,6 +125,9 @@
 506
 507     void BeginEdit(int row, int col, wxGrid *grid);
 508     bool EndEdit(int row, int col, wxGrid *grid);
 509 +   bool EndEdit(int WXUNUSED(row), int WXUNUSED(col), const wxGrid * WXUNUSED(grid),
 510 +       const wxString& WXUNUSED(oldval), wxString * WXUNUSED(newval)) {return false;};
 511 +   void ApplyEdit(int WXUNUSED(row), int WXUNUSED(col), wxGrid* WXUNUSED(grid)) {};
 512
 513     void Reset();
 514
 515 --- audacity-src-2.0.5/src/widgets/TimeTextCtrl.cpp     2013-10-19 09:31:50.000000000 +0200
 516 +++ audacity-src-2.0.5/src/widgets/TimeTextCtrl.cpp     2014-01-18 22:29:03.714552995 +0100
 517 @@ -176,6 +176,7 @@
 518  #include <wx/stattext.h>
 519  #include <wx/tooltip.h>
 520  #include <wx/toplevel.h>
 521 +#include <wx/dcclient.h>
 522
 523  #ifdef _DEBUG
 524      #ifdef _MSC_VER
 525 @@ -425,7 +426,7 @@
 526  {
 527     wxCommandEvent e(EVT_RELEASE_KEYBOARD);
 528     e.SetEventObject(this);
 529 -   GetParent()->GetEventHandler()->ProcessEvent(e);
 530 +   GetParent()->ProcessWindowEvent(e);
 531
 532     if (mBackgroundBitmap)
 533        delete mBackgroundBitmap;
 534 @@ -1044,7 +1045,7 @@
 535        e.SetEventType(EVT_RELEASE_KEYBOARD);
 536     }
 537     e.SetEventObject(this);
 538 -   GetParent()->GetEventHandler()->ProcessEvent(e);
 539 +   GetParent()->ProcessWindowEvent(e);
 540
 541     Refresh(false);
 542  }
 543 @@ -1160,7 +1161,7 @@
 544        nevent.SetDirection(!event.ShiftDown());
 545        nevent.SetEventObject(parent);
 546        nevent.SetCurrentFocus(parent);
 547 -      GetParent()->ProcessEvent(nevent);
 548 +      GetParent()->ProcessWindowEvent(nevent);
 549     }
 550
 551     else if (keyCode == WXK_RETURN || keyCode == WXK_NUMPAD_ENTER) {
 552 @@ -1169,7 +1170,7 @@
 553        if (def && def->IsEnabled()) {
 554           wxCommandEvent cevent(wxEVT_COMMAND_BUTTON_CLICKED,
 555                                 def->GetId());
 556 -         GetParent()->ProcessEvent(cevent);
 557 +         GetParent()->ProcessWindowEvent(cevent);
 558        }
 559     }
 560
 561 @@ -1218,7 +1219,7 @@
 562  {
 563     wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, GetId());
 564     event.SetEventObject(this);
 565 -   GetEventHandler()->ProcessEvent(event);
 566 +   ProcessWindowEvent(event);
 567
 568  #if wxUSE_ACCESSIBILITY
 569     GetAccessible()->NotifyEvent(wxACC_EVENT_OBJECT_NAMECHANGE,
 570 --- audacity-src-2.0.5/src/xml/XMLWriter.cpp~   2013-10-19 09:31:48.000000000 +0200
 571 +++ audacity-src-2.0.5/src/xml/XMLWriter.cpp    2014-01-18 22:31:17.405663293 +0100
 572 @@ -246,7 +246,7 @@
 573        mHasKids[0] = true;
 574     }
 575
 576 -   Write(value.c_str());
 577 +   Write(value);
 578  }
 579
 580  void XMLWriter::WriteSubTree(const wxChar *value)
 581 --- audacity-src-2.0.5/src/effects/nyquist/Nyquist.cpp~ 2013-10-19 09:31:50.000000000 +0200
 582 +++ audacity-src-2.0.5/src/effects/nyquist/Nyquist.cpp  2014-01-18 22:32:46.528625569 +0100
 583 @@ -701,7 +701,8 @@
 584           // See also http://bugzilla.audacityteam.org/show_bug.cgi?id=642#c9
 585           // for further info about this thread safety question.
 586           wxString prevlocale = wxSetlocale(LC_NUMERIC, NULL);
 587 -         wxSetlocale(LC_NUMERIC, wxT("C"));
 588 +         wxString C(wxT("C"));
 589 +         wxSetlocale(LC_NUMERIC, C);
 590
 591           nyx_init();
 592           nyx_set_os_callback(StaticOSCallback, (void *)this);
 593 --- audacity-src-2.0.5/src/PitchName.cpp~       2014-01-18 22:36:45.000000000 +0100
 594 +++ audacity-src-2.0.5/src/PitchName.cpp        2014-01-18 22:36:48.306661815 +0100
 595 @@ -20,6 +20,8 @@
 596  #include <math.h>
 597  #include <stdio.h>
 598
 599 +#include <wx/string.h>
 600 +
 601  #include "PitchName.h"
 602
 603
 604 --- audacity-src-2.0.5/src/LyricsWindow.cpp.org 2014-01-18 22:45:15.566855563 +0100
 605 +++ audacity-src-2.0.5/src/LyricsWindow.cpp     2014-01-19 00:21:21.443062502 +0100
 606 @@ -68,11 +68,10 @@
 607     // loads either the XPM or the windows resource, depending on the platform
 608     #if !defined(__WXMAC__) && !defined(__WXX11__)
 609        #ifdef __WXMSW__
 610 -         wxIcon ic(wxICON(AudacityLogo));
 611 +         SetIcon(wxICON(AudacityLogo));
 612        #else
 613 -         wxIcon ic(wxICON(AudacityLogo48x48));
 614 +         SetIcon(wxICON(AudacityLogo48x48));
 615        #endif
 616 -      SetIcon(ic);
 617     #endif
 618
 619     wxPoint panelPos(0, 0);
 620 --- audacity-src-2.0.5/src/MixerBoard.cpp~      2013-10-19 09:31:50.000000000 +0200
 621 +++ audacity-src-2.0.5/src/MixerBoard.cpp       2014-01-19 00:22:04.117814479 +0100
 622 @@ -1723,11 +1723,10 @@
 623     // loads either the XPM or the windows resource, depending on the platform
 624     #if !defined(__WXMAC__) && !defined(__WXX11__)
 625        #ifdef __WXMSW__
 626 -         wxIcon ic(wxICON(AudacityLogo));
 627 +         SetIcon(wxICON(AudacityLogo));
 628        #else
 629 -         wxIcon ic(wxICON(AudacityLogo48x48));
 630 +         SetIcon(wxICON(AudacityLogo48x48));
 631        #endif
 632 -      SetIcon(ic);
 633     #endif
 634  }
 635
 636 --- audacity-src-2.0.5/src/Project.cpp~ 2014-01-18 22:40:12.000000000 +0100
 637 +++ audacity-src-2.0.5/src/Project.cpp  2014-01-19 00:23:07.386584398 +0100
 638 @@ -981,14 +981,14 @@
 639     // loads either the XPM or the windows resource, depending on the platform
 640  #if !defined(__WXMAC__) && !defined(__WXX11__)
 641     #if defined(__WXMSW__)
 642 -      wxIcon ic(wxICON(AudacityLogo));
 643 +      SetIcon(wxICON(AudacityLogo));
 644     #elif defined(__WXGTK__)
 645 -      wxIcon ic(wxICON(AudacityLogoAlpha));
 646 +      SetIcon(wxICON(AudacityLogoAlpha));
 647     #else
 648        wxIcon ic;
 649        ic.CopyFromBitmap(theTheme.Bitmap(bmpAudacityLogo48x48));
 650 +      SetIcon(ic);
 651     #endif
 652 -   SetIcon(ic);
 653  #endif
 654     mIconized = false;
 655