timw4mail
/
Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up some old compiler warning stuff

This commit is contained in:
Timothy Warren 2019-07-01 13:12:56 -04:00
parent 1dc90d9d59
commit 8ea7ad4abc
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/TyroApp.cpp
View File

@ -67,7 +67,7 @@ public:
* *
* @return int * @return int
*/ */
int OnExit() override int OnExit() final
{ {
wxLogDebug("Closing App..."); wxLogDebug("Closing App...");
@ -84,7 +84,7 @@ public:
* @param wxCmdLineParser& parser * @param wxCmdLineParser& parser
* @return void * @return void
*/ */
void OnInitCmdLine(wxCmdLineParser &parser) override void OnInitCmdLine(wxCmdLineParser &parser) final
{ {
parser.SetDesc(Glob_cmdLineDesc); parser.SetDesc(Glob_cmdLineDesc);
@ -98,7 +98,7 @@ public:
* @param wxCmdLineParser& parser * @param wxCmdLineParser& parser
* @return bool * @return bool
*/ */
bool OnCmdLineParsed(wxCmdLineParser &parser) override bool OnCmdLineParsed(wxCmdLineParser &parser) final
{ {
// Get un-named parameters // Get un-named parameters
this->param_count = parser.GetParamCount(); this->param_count = parser.GetParamCount();

8
src/definitions.h
View File

@ -27,10 +27,6 @@ const wxString APP_LICENSE = "Copyright 2019 Timothy J. Warren\n"
"IN THE SOFTWARE."; "IN THE SOFTWARE.";
// Command-line arguments // Command-line arguments
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wmissing-field-initializers"
#endif
const wxCmdLineEntryDesc Glob_cmdLineDesc[] = { const wxCmdLineEntryDesc Glob_cmdLineDesc[] = {
{ {
wxCMD_LINE_PARAM, wxCMD_LINE_PARAM,
@ -42,9 +38,6 @@ const wxCmdLineEntryDesc Glob_cmdLineDesc[] = {
}, },
{wxCMD_LINE_NONE} {wxCMD_LINE_NONE}
}; };
#ifdef __clang__
#pragma clang diagnostic pop
#endif
// Some boilerplate text // Some boilerplate text
const wxString TYRO_SAVE_ERROR = "Failed to save the file. Maybe you lack the permissions."; const wxString TYRO_SAVE_ERROR = "Failed to save the file. Maybe you lack the permissions.";
@ -53,7 +46,6 @@ const wxString TYRO_OPEN_ERROR = "Failed to open the file. Check that it exists,
const wxString TYRO_OPEN_ERROR_CAPTION = "Open Failed"; const wxString TYRO_OPEN_ERROR_CAPTION = "Open Failed";
// Font defaults // Font defaults
const int TYRO_DEFAULT_FONT_FAMILY = (int) wxFONTFAMILY_MODERN;
#ifdef __WXMAC__ #ifdef __WXMAC__
const int TYRO_DEFAULT_FONT_SIZE = 14; const int TYRO_DEFAULT_FONT_SIZE = 14;
#else #else

16
src/wx_common.h
View File

@ -3,16 +3,11 @@
*/ */
#pragma once #pragma once
// Import the basename c function
#include <libgen.h> #include <libgen.h>
#include "common.h" #include "common.h"
// Disable annoying warning
#ifndef __WXMAC__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wpotentially-evaluated-expression"
#endif
#ifdef WX_PRECOMP #ifdef WX_PRECOMP
#include "wx_pch.h" #include "wx_pch.h"
#endif #endif
@ -33,10 +28,6 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/artprov.h> #include <wx/artprov.h>
#ifndef __WXMAC__
#pragma clang diagnostic pop
#endif
/** /**
* Calculate original window size based on size of the current monitor * Calculate original window size based on size of the current monitor
*/ */
@ -47,7 +38,10 @@ wxSize static CalculateWindowSize()
wxLogDebug("Current display: %ix%i", mode.w, mode.h); wxLogDebug("Current display: %ix%i", mode.w, mode.h);
wxSize base((int)((float)mode.w * 0.9), (int)((float)mode.h * 0.9)); auto width = (int)((float)mode.w * 0.9);
auto height = (int)((float)mode.h * 0.9);
wxSize base(width, height);
return base; return base;
} }