github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix gcc compiler warnings\errors 

- avoid upper/lowercase issue for #include <windowsx.h>
- casts to avoid warning: conversion from ‘int’ to ‘UCHAR’ {aka ‘unsigned char’} may change value [-Wconversion]
- cast to avoid warning: conversion from ‘int’ to ‘BYTE’ {aka ‘unsigned char’} may change value [-Wconversion]
- avoid warning : delete called on non-final 'FileDialogEventHandler' that has virtual functions but non-virtual destructor [-Wdelete-non-abstract-non-virtual-dtor]
- avoid warning : warning: extra ';' [-Wpedantic] in BabyGrid.cpp

Close #14950
pull/14956/head
Christian Grasser 2024-04-05 08:56:02 +02:00 committed by Don Ho
parent 1f4cbdb8b7
commit 8d3d8aa642
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/Notepad_plus.cpp
View File

@ -4399,7 +4399,7 @@ void Notepad_plus::showView(int whichOne)
} }
_pMainWindow->display(true); _pMainWindow->display(true);
_mainWindowStatus |= (whichOne==MAIN_VIEW)?WindowMainActive:WindowSubActive; _mainWindowStatus |= static_cast<UCHAR>((whichOne==MAIN_VIEW)?WindowMainActive:WindowSubActive);
//Send sizing info to make windows fit //Send sizing info to make windows fit
::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, 0, 0); ::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, 0, 0);
@ -4450,7 +4450,7 @@ void Notepad_plus::hideView(int whichOne)
switchEditViewTo(otherFromView(whichOne)); switchEditViewTo(otherFromView(whichOne));
auto viewToDisable = static_cast<UCHAR>(whichOne == SUB_VIEW ? WindowSubActive : WindowMainActive); auto viewToDisable = static_cast<UCHAR>(whichOne == SUB_VIEW ? WindowSubActive : WindowMainActive);
_mainWindowStatus &= ~viewToDisable; _mainWindowStatus &= static_cast<UCHAR>(~viewToDisable);
} }
bool Notepad_plus::loadStyles() bool Notepad_plus::loadStyles()
@ -4675,7 +4675,7 @@ void Notepad_plus::undockUserDlg()
::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, 0, 0); ::SendMessage(_pPublicInterface->getHSelf(), WM_SIZE, 0, 0);
_mainWindowStatus &= ~WindowUserActive; _mainWindowStatus &= static_cast<UCHAR>(~WindowUserActive);
(ScintillaEditView::getUserDefineDlg())->display(); (ScintillaEditView::getUserDefineDlg())->display();
} }

2
PowerEditor/src/NppBigSwitch.cpp
View File

@ -19,7 +19,7 @@
#include <shlwapi.h> #include <shlwapi.h>
#include <uxtheme.h> // for EnableThemeDialogTexture #include <uxtheme.h> // for EnableThemeDialogTexture
#include <format> #include <format>
#include <Windowsx.h> // for GET_X_LPARAM, GET_Y_LPARAM #include <windowsx.h> // for GET_X_LPARAM, GET_Y_LPARAM
#include "Notepad_plus_Window.h" #include "Notepad_plus_Window.h"
#include "TaskListDlg.h" #include "TaskListDlg.h"
#include "ImageListSet.h" #include "ImageListSet.h"

4
PowerEditor/src/WinControls/Grid/BabyGrid.cpp
View File

@ -61,9 +61,9 @@ struct GridHandleStruct
COLORREF highlightcolorProtectNoFocus = RGB(200, 200, 200); COLORREF highlightcolorProtectNoFocus = RGB(200, 200, 200);
COLORREF gridlinecolor = RGB(220, 220, 220); COLORREF gridlinecolor = RGB(220, 220, 220);
COLORREF highlighttextcolor = RGB(255, 255, 255); COLORREF highlighttextcolor = RGB(255, 255, 255);
COLORREF backgroundcolor = GetSysColor(COLOR_BTNFACE);; COLORREF backgroundcolor = GetSysColor(COLOR_BTNFACE);
COLORREF titletextcolor = RGB(0, 0, 0); COLORREF titletextcolor = RGB(0, 0, 0);
COLORREF titlecolor = GetSysColor(COLOR_BTNFACE);; COLORREF titlecolor = GetSysColor(COLOR_BTNFACE);
COLORREF titlegridlinecolor = RGB(120, 120, 120); COLORREF titlegridlinecolor = RGB(120, 120, 120);
BOOL DRAWHIGHLIGHT = TRUE; BOOL DRAWHIGHLIGHT = TRUE;
BOOL ADVANCEROW = TRUE; BOOL ADVANCEROW = TRUE;

2
PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
View File

@ -205,7 +205,7 @@ namespace // anonymous
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class FileDialogEventHandler : public IFileDialogEvents, public IFileDialogControlEvents class FileDialogEventHandler final : public IFileDialogEvents, public IFileDialogControlEvents
{ {
public: public:
// IUnknown methods // IUnknown methods

2
PowerEditor/src/WinControls/shortcut/shortcut.h
View File

@ -95,7 +95,7 @@ public:
} }
BYTE getAcceleratorModifiers() { BYTE getAcceleratorModifiers() {
return ( FVIRTKEY | (_keyCombo._isCtrl?FCONTROL:0) | (_keyCombo._isAlt?FALT:0) | (_keyCombo._isShift?FSHIFT:0) ); return static_cast<BYTE>( FVIRTKEY | (_keyCombo._isCtrl?FCONTROL:0) | (_keyCombo._isAlt?FALT:0) | (_keyCombo._isShift?FSHIFT:0) );
}; };
Shortcut & operator=(const Shortcut & sc) { Shortcut & operator=(const Shortcut & sc) {

4
lexilla/lexers/LexUser.cxx
View File

@ -623,7 +623,7 @@ static bool IsNumber(StyleContext & sc, vector<string> * numberTokens[], vvstrin
static inline void SubGroup(const char * s, vvstring & vec, bool group=false) static inline void SubGroup(const char * s, vvstring & vec, bool group=false)
{ {
size_t length = strlen(s); size_t length = strlen(s);
char * temp = new char[length+1]; char * temp = new char[length+1] {};
unsigned int index = 0; unsigned int index = 0;
vector<string> subvector; vector<string> subvector;
unsigned int i = 0; unsigned int i = 0;
@ -697,7 +697,7 @@ static inline void SubGroup(const char * s, vvstring & vec, bool group=false)
static inline void GenerateVector(vvstring & vec, const char * s, const char * prefix, size_t minLength) static inline void GenerateVector(vvstring & vec, const char * s, const char * prefix, size_t minLength)
{ {
size_t length = strlen(s); size_t length = strlen(s);
char * temp = new char[length]; char * temp = new char[length] {};
unsigned int index = 0; unsigned int index = 0;
bool copy = false; bool copy = false;
bool inGroup = false; bool inGroup = false;