summaryrefslogtreecommitdiff
path: root/freefilesync/ffs_no_wx311.patch
blob: 871e08334ff811ddf6b239db92d9adfa2c8a7678 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
diff -Naur -x '*.orig' -x '*.rej' 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp
--- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-07 05:03:34.000000000 -0400
+++ 10.3-2/FreeFileSync/Source/ui/small_dlgs.cpp	2018-08-08 19:16:54.026727623 -0400
@@ -984,7 +984,8 @@
     //setMainInstructionFont(*m_staticTextMain);
 
     m_bitmapActivation->SetBitmap(getResourceImage(L"website"));
-    m_textCtrlOfflineActivationKey->ForceUpper();
+    // Fedora 27 does not have wxWidgets 3.1.1 yet. https://github.com/wxWidgets/wxWidgets/commit/69b66e9e2e2b8e49e3816acdde079686ce9b0da1
+    //m_textCtrlOfflineActivationKey->ForceUpper();
 
     m_textCtrlLastError           ->ChangeValue(lastErrorMsg);
     m_textCtrlManualActivationUrl ->ChangeValue(manualActivationUrl);
diff -Naur -x '*.orig' -x '*.rej' 10.3-0/wx+/grid.cpp 10.3-2/wx+/grid.cpp
--- 10.3-0/wx+/grid.cpp	2018-08-07 05:03:34.000000000 -0400
+++ 10.3-2/wx+/grid.cpp	2018-08-08 19:24:56.849445102 -0400
@@ -1176,7 +1176,9 @@
             {
                 if (overlapPix != 0)
                 {
-                    const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
+                    // Fedora 28 does not have wxGTK 3.1.1 yet. This probably breaks HiDPI usage
+                    //const double scrollSpeed = wnd_.ToDIP(overlapPix) * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
+                    const double scrollSpeed = overlapPix * mouseDragSpeedIncScrollU; //unit: [scroll units / sec]
                     toScroll += scrollSpeed * deltaSecs;
                 }
                 else
diff -Naur 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp
--- 10.6-0/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-13 06:58:40.771249592 -0500
+++ 10.6-1/FreeFileSync/Source/base/ffs_paths.cpp	2018-11-14 21:39:14.715702415 -0500
@@ -85,8 +85,11 @@
     else //OS standard path (XDG layout): ~/.config/FreeFileSync
     {
         //wxBug: wxStandardPaths::GetUserDataDir() does not honor FileLayout_XDG flag
-        wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
-        cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + "FreeFileSync";
+
+        // Fedora 28 does not have wxGTK 3.1.1 yet.
+        // So subsitute a hard-coded name instead of requesting file layout of XDG
+        //wxStandardPaths::Get().SetFileLayout(wxStandardPaths::FileLayout_XDG);
+        cfgFolderPath = appendSeparator(utfTo<Zstring>(wxStandardPaths::Get().GetUserConfigDir())) + appendSeparator(utfTo<Zstring>(".config")) + "FreeFileSync";
     }
 
     std::call_once(onceFlagCreateCfgPath, [&]
bgstack15