Remove backported code supporting wx-3.0

vslavik · Jan 30, 2024 · 6cdd320 · 6cdd320
1 parent 9feb39a
commit 6cdd320
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 437 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -4,12 +4,6 @@ WX_LIBS = @WX_LIBS@
 
 bin_PROGRAMS = poedit
 
-WX_BACKPORT_SRC = wx_backports/wx_gtk_activityindicator.cpp \
-                  wx_backports/activityindicator.h \
-                  wx_backports/gtk_activityindicator.h \
-                  wx_backports/nativewin.h \
-                  wx_backports/wx_gtk_nativewin.cpp
-
 if HAVE_CPPREST
 ACCOUNTS_SUPPORT_SRC = \
                  http_client.h http_client.cpp http_client_casablanca.cpp \
@@ -83,8 +77,7 @@ poedit_SOURCES = \
                  version.h \
                  welcomescreen.cpp welcomescreen.h \
                  pugixml.h \
-                 $(ACCOUNTS_SUPPORT_SRC) \
-                 $(WX_BACKPORT_SRC)
+                 $(ACCOUNTS_SUPPORT_SRC)
 nodist_poedit_SOURCES = compiled_xrc.cpp
 
 poedit_LDADD = $(WX_LIBS) $(LUCENE_LIBS) $(CLD2_LIBS) $(PUGIXML_LIBS) $(ACCOUNTS_SUPPORT_LIBS) \

diff --git a/src/customcontrols.cpp b/src/customcontrols.cpp
@@ -30,6 +30,7 @@
 #include "hidpi.h"
 #include "utility.h"
 
+#include <wx/activityindicator.h>
 #include <wx/app.h>
 #include <wx/artprov.h>
 #include <wx/clipbrd.h>
@@ -47,12 +48,6 @@
 #include <wx/generic/private/markuptext.h>
 #endif
 
-#if wxCHECK_VERSION(3,1,0)
-    #include <wx/activityindicator.h>
-#else
-    #include "wx_backports/activityindicator.h"
-#endif
-
 #include <unicode/brkiter.h>
 #ifdef __WXGTK__
 #include <gtk/gtk.h>

diff --git a/src/propertiesdlg.cpp b/src/propertiesdlg.cpp
@@ -42,15 +42,10 @@
 #include <wx/sizer.h>
 #include <wx/stattext.h>
 #include <wx/menu.h>
+#include <wx/nativewin.h>
 #include <wx/notebook.h>
 #include <wx/windowptr.h>
 
-#include <wx/nativewin.h>
-#if !wxCHECK_VERSION(3,1,0)
-  #include "wx_backports/nativewin.h"
-#endif
-
-
 #include <algorithm>
 #include <functional>
 #include <memory>

diff --git a/src/wx_backports/activityindicator.h b/src/wx_backports/activityindicator.h
diff --git a/src/wx_backports/gtk_activityindicator.h b/src/wx_backports/gtk_activityindicator.h
diff --git a/src/wx_backports/nativewin.h b/src/wx_backports/nativewin.h