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