Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid harmless signed/unsigned warning in g++ 5.4 wxGTK build

Browse Source 
Change GTKGetEntryTextLength() to return a signed value, as it's always
either assigned to or compared with the signed variables anyhow.

This avoids a couple of -Wsign-compare warnings when building with g++
5.4 from Ubuntu 16.04.
This commit is contained in:
Vadim Zeitlin
2018-10-11 01:05:43 +02:00
parent ea71ea1259
commit 8e1c4e9238
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/textentry.h
View File

@@ -84,7 +84,7 @@ protected:
// Override the base class method to use GtkEntry IM context. // Override the base class method to use GtkEntry IM context.
virtual int GTKIMFilterKeypress(GdkEventKey* event) const; virtual int GTKIMFilterKeypress(GdkEventKey* event) const;
static unsigned int GTKGetEntryTextLength(GtkEntry* entry); static int GTKGetEntryTextLength(GtkEntry* entry);
private: private:
// implement this to return the associated GtkEntry or another widget // implement this to return the associated GtkEntry or another widget

4
src/gtk/textentry.cpp
View File

@@ -41,7 +41,7 @@
// helper function to get the length of the text // helper function to get the length of the text
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static unsigned int GetEntryTextLength(GtkEntry* entry) static int GetEntryTextLength(GtkEntry* entry)
{ {
#if GTK_CHECK_VERSION(2, 14, 0) #if GTK_CHECK_VERSION(2, 14, 0)
if ( wx_is_at_least_gtk2(14) ) if ( wx_is_at_least_gtk2(14) )
@@ -582,7 +582,7 @@ void wxTextEntry::Remove(long from, long to)
} }
// static // static
unsigned int wxTextEntry::GTKGetEntryTextLength(GtkEntry* entry) int wxTextEntry::GTKGetEntryTextLength(GtkEntry* entry)
{ {
return GetEntryTextLength(entry); return GetEntryTextLength(entry);
} }