tintii/tintii.patch

   1 diff -aur src/tintii-2.5.2/config.py src2//tintii-2.5.2/config.py
   2 --- src/tintii-2.5.2/config.py  2011-02-23 12:33:01.000000000 +0100
   3 +++ src2//tintii-2.5.2/config.py        2011-04-22 15:31:55.000000000 +0200
   4 @@ -13,5 +13,5 @@
   5  # Linux/g++ compiler options
   6  CXX='g++'
   7  CXXFLAGS='-O3 -Wall -funroll-loops -fomit-frame-pointer `wx-config --cxxflags` -fopenmp -ffast-math -g'
   8 -LINKFLAGS='`wx-config --libs` `wx-config --libs aui` -fopenmp -g'
   9 +LINKFLAGS='`wx-config --libs | sed "s|-Wl.*ded ||"` `wx-config --libs aui | sed "s|-Wl.*ded ||"` -fopenmp -g'
  10  #NDEBUG='yes'
  11 diff -aur src/tintii-2.5.2/src/indii/tint/gui/PreviewImage.cpp src2//tintii-2.5.2/src/indii/tint/gui/PreviewImage.cpp
  12 --- src/tintii-2.5.2/src/indii/tint/gui/PreviewImage.cpp        2011-04-21 08:53:44.000000000 +0200
  13 +++ src2//tintii-2.5.2/src/indii/tint/gui/PreviewImage.cpp      2011-04-22 15:23:59.000000000 +0200
  14 @@ -251,11 +251,9 @@
  15    GetViewStart(&x, &y);
  16    GetScrollPixelsPerUnit(&xUnit, &yUnit);
  17
  18 -  if (evt.GetWheelAxis() == 0) {
  19 -         y -= evt.GetWheelRotation();
  20 -  } else {
  21 -    x -= evt.GetWheelRotation();
  22 -  }
  23 +  y -= evt.GetWheelRotation();
  24 +  x -= evt.GetWheelRotation();
  25 +
  26    Scroll(x, y);
  27  }
  28
  29 diff -aur src/tintii-2.5.2/src/indii/tint/gui/TintAbout.cpp src2//tintii-2.5.2/src/indii/tint/gui/TintAbout.cpp
  30 --- src/tintii-2.5.2/src/indii/tint/gui/TintAbout.cpp   2011-04-21 08:53:44.000000000 +0200
  31 +++ src2//tintii-2.5.2/src/indii/tint/gui/TintAbout.cpp 2011-04-22 15:23:59.000000000 +0200
  32 @@ -22,5 +22,5 @@
  33    info.SetWebSite(_("http://www.indii.org/tintii"));
  34    info.SetCopyright(_("Copyright 2007-2011 Lawrence Murray"));
  35
  36 -  wxAboutBox(info, parent);
  37 +  wxAboutBox(info);
  38  }
  39 diff -aur src/tintii-2.5.2/src/indii/tint/gui/TintHelp.cpp src2//tintii-2.5.2/src/indii/tint/gui/TintHelp.cpp
  40 --- src/tintii-2.5.2/src/indii/tint/gui/TintHelp.cpp    2011-04-21 08:53:44.000000000 +0200
  41 +++ src2//tintii-2.5.2/src/indii/tint/gui/TintHelp.cpp  2011-04-22 15:23:59.000000000 +0200
  42 @@ -84,8 +84,8 @@
  43      }
  44                 #endif
  45    } else {
  46 -    wxMessageBox(wxString("The tintii online help system could not be loaded.\n\nMake sure "
  47 -        "that the tintii.htb file is in the ") <<
  48 +    wxMessageBox(wxString(_T("The tintii online help system could not be loaded.\n\nMake sure ")
  49 +        _T("that the tintii.htb file is in the ")) <<
  50          wxStandardPaths::Get().GetResourcesDir() <<
  51          _(" directory, and restart tintii."),
  52          _("Error"), wxOK|wxICON_HAND, NULL);
  53 diff -aur src/tintii-2.5.2/src/indii/tint/gui/TintRegistration.cpp src2//tintii-2.5.2/src/indii/tint/gui/TintRegistration.cpp
  54 --- src/tintii-2.5.2/src/indii/tint/gui/TintRegistration.cpp    2011-04-21 08:53:44.000000000 +0200
  55 +++ src2//tintii-2.5.2/src/indii/tint/gui/TintRegistration.cpp  2011-04-22 15:23:59.000000000 +0200
  56 @@ -75,7 +75,7 @@
  57    fntUrl.SetUnderlined(true);
  58    butUrl->SetForegroundColour(*wxBLUE);
  59         #endif
  60 -  lblTitle->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold());
  61 +  lblTitle->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
  62    lblDesc->SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
  63
  64    txtKey = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
  65 diff -aur src/tintii-2.5.2/src/indii/tint/gui/TintSplash.cpp src2//tintii-2.5.2/src/indii/tint/gui/TintSplash.cpp
  66 --- src/tintii-2.5.2/src/indii/tint/gui/TintSplash.cpp  2011-04-21 08:53:44.000000000 +0200
  67 +++ src2//tintii-2.5.2/src/indii/tint/gui/TintSplash.cpp        2011-04-22 15:23:59.000000000 +0200
  68 @@ -51,7 +51,7 @@
  69      } else {
  70             dc.SetBrush(*wxBLACK);
  71      }
  72 -    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold());
  73 +    dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
  74      dc.SetPen(wxNullPen);
  75      dc.SetTextBackground(*wxWHITE);
  76      dc.SetTextForeground(*wxWHITE);
  77 diff -aur src/tintii-2.5.2/src/indii/tint/gui/TintWindow.cpp src2//tintii-2.5.2/src/indii/tint/gui/TintWindow.cpp
  78 --- src/tintii-2.5.2/src/indii/tint/gui/TintWindow.cpp  2011-04-21 08:53:44.000000000 +0200
  79 +++ src2//tintii-2.5.2/src/indii/tint/gui/TintWindow.cpp        2011-04-22 15:23:59.000000000 +0200
  80 @@ -96,7 +96,7 @@
  81    /* save AUI perspective */
  82    wxConfig config(_("tintii"), _("indii.org"));
  83    wxString persp = manager->SavePerspective();
  84 -  config.Write(wxString("Perspective"), persp);
  85 +  config.Write(wxString(_T("Perspective")), persp);
  86
  87    manager->UnInit();
  88  }
  89 @@ -637,8 +637,8 @@
  90         tbTop->AddControl(new wxContextHelpButton(tbTop), _T("Context help"));
  91    }
  92    #else
  93 -  tbTop->AddStretchableSpace();
  94 -  tbTop->AddControl(new wxContextHelpButton(tbTop), _T("Context help"));
  95 +  tbTop->AddSeparator();
  96 +  tbTop->AddControl(new wxContextHelpButton(tbTop));
  97    #endif
  98    tbTop->Realize();
  99
 100 @@ -672,7 +672,7 @@
 101    width = MIN_THUMB_PANE_WIDTH;
 102    height = 512;
 103
 104 -  paneInfo.Name("Thumbs");
 105 +  paneInfo.Name(_T("Thumbs"));
 106    paneInfo.MinSize(wxSize(width, 110));
 107    paneInfo.BestSize(wxSize(width, height));
 108    paneInfo.FloatingSize(width + EXTRA_PANE_WIDTH, height + EXTRA_PANE_HEIGHT);
 109 @@ -686,7 +686,7 @@
 110    width = prePane->GetMinSize().GetWidth();
 111    height = prePane->GetMinSize().GetHeight();
 112
 113 -  paneInfo.Name("Preprocessing");
 114 +  paneInfo.Name(_T("Preprocessing"));
 115    paneInfo.MinSize(wxSize(width, height));
 116    paneInfo.BestSize(wxSize(width, height));
 117    paneInfo.FloatingSize(width + EXTRA_PANE_WIDTH, height + EXTRA_PANE_HEIGHT);
 118 @@ -703,7 +703,7 @@
 119    width = postPane->GetMinSize().GetWidth();
 120    height = postPane->GetMinSize().GetHeight();
 121
 122 -  paneInfo.Name("Postprocessing");
 123 +  paneInfo.Name(_T("Postprocessing"));
 124    paneInfo.MinSize(wxSize(width, height));
 125    paneInfo.BestSize(wxSize(width, height));
 126    paneInfo.FloatingSize(width + EXTRA_PANE_WIDTH, height + EXTRA_PANE_HEIGHT);
 127 @@ -718,7 +718,7 @@
 128    width = mixerPane->GetMinSize().GetWidth();
 129    height = mixerPane->GetMinSize().GetHeight();
 130
 131 -  paneInfo.Name("Mixer");
 132 +  paneInfo.Name(_T("Mixer"));
 133    paneInfo.MinSize(wxSize(width, height));
 134    paneInfo.BestSize(wxSize(width, height));
 135    paneInfo.FloatingSize(width + EXTRA_PANE_WIDTH, height + EXTRA_PANE_HEIGHT);
 136 @@ -770,7 +770,7 @@
 137
 138      wxAuiPaneInfo paneInfo;
 139      paneInfo.DefaultPane();
 140 -    paneInfo.Name("Buttons");
 141 +    paneInfo.Name(_T("Buttons"));
 142      paneInfo.MinSize(wxSize(width, height));
 143      paneInfo.BestSize(wxSize(width, height));
 144      paneInfo.CaptionVisible(false);
 145 diff -aur src/tintii-2.5.2/src/indii/tint/ImageCache.cpp src2//tintii-2.5.2/src/indii/tint/ImageCache.cpp
 146 --- src/tintii-2.5.2/src/indii/tint/ImageCache.cpp      2011-04-21 08:53:44.000000000 +0200
 147 +++ src2//tintii-2.5.2/src/indii/tint/ImageCache.cpp    2011-04-22 15:23:59.000000000 +0200
 148 @@ -40,7 +40,7 @@
 149      if (find != cache.end()) {
 150        image = find->second;
 151      } else {
 152 -      wxImageResizeQuality quality;
 153 +      int quality;
 154        if (high) {
 155          quality = wxIMAGE_QUALITY_HIGH;
 156        } else {