summaryrefslogtreecommitdiff
path: root/support/dktools/DkWxBmepsFrame.wxc
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/DkWxBmepsFrame.wxc
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/DkWxBmepsFrame.wxc')
-rw-r--r--support/dktools/DkWxBmepsFrame.wxc49
1 files changed, 35 insertions, 14 deletions
diff --git a/support/dktools/DkWxBmepsFrame.wxc b/support/dktools/DkWxBmepsFrame.wxc
index 1d367de58a..3d964e1781 100644
--- a/support/dktools/DkWxBmepsFrame.wxc
+++ b/support/dktools/DkWxBmepsFrame.wxc
@@ -2,7 +2,7 @@
copyright owner = Dirk Krause
copyright year = 2011-xxxx
-license = bsd
+SPDX-License-Identifier: BSD-3-Clause
%% wx-gui
@@ -154,7 +154,11 @@ class DkWxBmepsFrame : public DkWxFrame
/** Event table.
*/
+#if wxCHECK_VERSION(3,0,0)
+ wxDECLARE_EVENT_TABLE();
+#else
DECLARE_EVENT_TABLE()
+#endif
void
findPaperSizes();
@@ -364,16 +368,17 @@ class DkWxBmepsFrame : public DkWxFrame
+#include "dk3conf.h"
#include "wxbmeps.h"
/*
Icons and bitmaps
*/
-#include "dkicon.xpm"
-#include "choose-dir.xpm"
-#include "exit-program.xpm"
-#include "run-conversion.xpm"
-#include "set-options.xpm"
+#include "gui-img/icons/dkicon.xpm"
+#include "gui-img/shared/toolbar/choose-dir.xpm"
+#include "gui-img/shared/toolbar/exit-program.xpm"
+#include "gui-img/shared/toolbar/run-conversion.xpm"
+#include "gui-img/shared/toolbar/set-options.xpm"
#include "dk4verswx.h"
@@ -469,6 +474,11 @@ $!end
+#if __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
static const wxCmdLineEntryDesc wxbmepsframe_cmd_line_desc[] = {
{
wxCMD_LINE_OPTION,
@@ -500,10 +510,17 @@ static const wxCmdLineEntryDesc wxbmepsframe_cmd_line_desc[] = {
{ wxCMD_LINE_NONE }
};
+#if __GNUC__
+#pragma GCC diagnostic pop
+#endif
/** Event table for the DkWxBmepsFrame class.
*/
-BEGIN_EVENT_TABLE(DkWxBmepsFrame, wxFrame)
+#if wxCHECK_VERSION(3,0,0)
+wxBEGIN_EVENT_TABLE(DkWxBmepsFrame,wxFrame)
+#else
+BEGIN_EVENT_TABLE(DkWxBmepsFrame,wxFrame)
+#endif
EVT_MENU(DkWxBmeps_Quit, DkWxBmepsFrame::OnQuit)
EVT_MENU(DkWxBmeps_Help_Contents, DkWxBmepsFrame::OnHelpContents)
EVT_MENU(DkWxBmeps_About, DkWxBmepsFrame::OnAbout)
@@ -512,7 +529,11 @@ BEGIN_EVENT_TABLE(DkWxBmepsFrame, wxFrame)
EVT_MENU(DkWxBmeps_ResetOptions, DkWxBmepsFrame::OnResetOptions)
EVT_MENU(DkWxBmeps_Run, DkWxBmepsFrame::OnRunConversion)
EVT_IDLE(DkWxBmepsFrame::OnIdle)
+#if wxCHECK_VERSION(3,0,0)
+wxEND_EVENT_TABLE()
+#else
END_EVENT_TABLE()
+#endif
@@ -600,7 +621,8 @@ DkWxBmepsFrame::DkWxBmepsFrame(
bmeo.make = 1;
}
if(parser.Found(wxT("l"), &sLanguage)) {
- ptr = sLanguage.c_str();
+ wxCStrData slstrdata = sLanguage.c_str();
+ ptr = (wxChar const *)slstrdata;
if(ptr) {
if(applicationHelper->wxToDk(bu, DK3_SIZEOF(bu,dkChar), ptr)) {
(void)dk3bmeo_set_language(
@@ -625,7 +647,8 @@ DkWxBmepsFrame::DkWxBmepsFrame(
}
}
cmdfn = fn.GetFullPath();
- newfn = cmdfn.c_str();
+ wxCStrData cmdfnstrdata = cmdfn.c_str();
+ newfn = (wxChar const *)cmdfnstrdata;
if(newfn) { $? ". newfn (1)"
newfn = dk3wxs_dup_app(newfn, applicationHelper->getApp());
if(newfn) { $? ". newfn (2)"
@@ -659,9 +682,6 @@ DkWxBmepsFrame::DkWxBmepsFrame(
$? ". predicotr = %d", bmeo.pred
$? ". background = %d %d %d %d", bmeo.bgr, bmeo.bgg, bmeo.bgb, bmeo.fbg
$? ". interpolate = %d %d", bmeo.ip, bmeo.jip
-#if 0
- restorePosition();
-#endif
$? "- DkWxBmepsFrame::DkWxBmepsFrame"
}
@@ -953,7 +973,8 @@ DkWxBmepsFrame::OnChooseDirectory(wxCommandEvent& WXUNUSED(event))
pHelper->setRelatedPosition(this, &dd, &ddx, &ddy);
if(dd.ShowModal() == wxID_OK) {
wxString path = dd.GetPath();
- ptr = path.c_str();
+ wxCStrData pathstrdata = path.c_str();
+ ptr = (wxChar const *)pathstrdata;
if(ptr) {
np = dk3wxs_dup_app(ptr, pHelper->getApp());
if(np) {
@@ -1159,7 +1180,7 @@ DkWxBmepsFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
sVersion.Append(wxT("DK tools, wxWidgets, libpng, libjpeg, libtiff, zlib."));
sVersion.Append(wxT("\n\n"));
sVersion.Append(sTexts[124]);
- sVersion.Append(wxT("http://dktools.sourceforge.net\n"));
+ sVersion.Append(wxT("http://sourceforge.net/p/dktools/wiki/Home/\n"));
sVersion.Append(wxT("http://www.wxwidgets.org\n"));
sVersion.Append(wxT("http://www.libpng.org/pub/png/libpng.html\n"));
sVersion.Append(wxT("http://www.ijg.org\n"));