From 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:11:09 +0200 Subject: 3.15 --- wxWidgets-Fix/apply-patches.cmd | 8 +++----- wxWidgets-Fix/filepicker.h.patch | 19 ------------------- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 wxWidgets-Fix/filepicker.h.patch (limited to 'wxWidgets-Fix') diff --git a/wxWidgets-Fix/apply-patches.cmd b/wxWidgets-Fix/apply-patches.cmd index 361abedd..80b94874 100644 --- a/wxWidgets-Fix/apply-patches.cmd +++ b/wxWidgets-Fix/apply-patches.cmd @@ -1,8 +1,6 @@ @if [%1]==[] echo Please pass wxWidgets installation directory as %%1 parameter, e.g.: C:\Programme\C++\wxWidgets && pause && exit ::fix grid-label double-click to auto-size columns -patch %1\src\generic\grid.cpp grid.cpp.patch -patch %1\include\wx\generic\grid.h grid.h.patch - -::fix translation of "Browse" text -patch %1\include\wx\filepicker.h filepicker.h.patch \ No newline at end of file +patch "%1\src\generic\grid.cpp" grid.cpp.patch +patch "%1\include\wx\generic\grid.h" grid.h.patch +pause \ No newline at end of file diff --git a/wxWidgets-Fix/filepicker.h.patch b/wxWidgets-Fix/filepicker.h.patch deleted file mode 100644 index d72184c4..00000000 --- a/wxWidgets-Fix/filepicker.h.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- old 2009-03-06 11:00:42.000000000 +0100 -+++ include\wx\filepicker.h 2009-10-24 16:55:45.968750000 +0200 -@@ -17,6 +17,7 @@ - #if wxUSE_FILEPICKERCTRL || wxUSE_DIRPICKERCTRL - - #include "wx/pickerbase.h" -+#include "wx/intl.h" - - class WXDLLIMPEXP_FWD_CORE wxDialog; - class WXDLLIMPEXP_FWD_CORE wxFileDirPickerEvent; -@@ -326,7 +329,7 @@ - const wxString& message, - const wxString& WXUNUSED(wildcard)) - { -- return new wxDirPickerWidget(parent, wxID_ANY, wxDirPickerWidgetLabel, -+ return new wxDirPickerWidget(parent, wxID_ANY, _("Browse"), - path, message, - wxDefaultPosition, wxDefaultSize, - GetPickerStyle(GetWindowStyle())); -- cgit