fix some warnings from GCC -Wextra

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index ee31afec70377c07e6b032a8b4dbb38cf4f237ec..23e6747392e0e3a2974257d8cbd4c7627adaf0a8 100644 (file)
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -478,7 +478,9 @@ public:
         : m_text(text), m_icon(icon)
     { }
     wxDataViewIconText( const wxDataViewIconText &other )
-    { m_icon = other.m_icon; m_text = other.m_text; }
+        : wxObject()
+        , m_text(other.m_text), m_icon(other.m_icon)
+    { }
 
     void SetText( const wxString &text ) { m_text = text; }
     wxString GetText() const             { return m_text; }

diff --git a/include/wx/dcsvg.h b/include/wx/dcsvg.h
index 2ac99a25485adf363187ee0abcd3fce9930510d0..fc17548fae88995fffbe57d002e3a195846bd122 100644 (file)
--- a/include/wx/dcsvg.h
+++ b/include/wx/dcsvg.h
@@ -114,7 +114,7 @@ private:
 
    virtual void DoDrawArc(wxCoord, wxCoord, wxCoord, wxCoord, wxCoord, wxCoord);
 
-   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = 0);
+   virtual void DoDrawBitmap(const wxBitmap &, wxCoord, wxCoord, bool = false);
 
    virtual void DoDrawCheckMark(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
 

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 97d6f5e00b6e1a8f8f67eeaeeb67d0508ee59771..eb5e729ad5888296e4f383a9df58d3ec817bce6f 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -31,6 +31,7 @@ public:
         InitFromStream(stream, lenFile);
     }
     wxMemoryInputStream(wxMemoryInputStream& stream)
+        : wxInputStream()
     {
         InitFromStream(stream, wxInvalidOffset);
     }

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 11b113004febe500cf47d35057e2c92b4ba7522e..676ff07f1262973564b219c27eed7975fbf0d10e 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -176,7 +176,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 
                 // the best icon is by default (arbitrarily) the first one but
                 // if we find a system-sized icon, take it instead
-                if ( sx == sysX && sy == sysY || !iconBest.IsOk() )
+                if ((sx == sysX && sy == sysY) || !iconBest.IsOk())
                     iconBest = icon;
             }
     }

diff --git a/src/common/regex.cpp b/src/common/regex.cpp
index 7879616899596c6fb642e7ec517ca256b7602b8f..f6ca8782913e64e3ec4ddfe6bf99610974e299b8 100644 (file)
--- a/src/common/regex.cpp
+++ b/src/common/regex.cpp
@@ -282,12 +282,14 @@ bool wxRegExImpl::Compile(const wxString& expr, int flags)
     // translate our flags to regcomp() ones
     int flagsRE = 0;
     if ( !(flags & wxRE_BASIC) )
+    {
 #ifndef WX_NO_REGEX_ADVANCED
         if (flags & wxRE_ADVANCED)
             flagsRE |= REG_ADVANCED;
         else
 #endif
             flagsRE |= REG_EXTENDED;
+    }
     if ( flags & wxRE_ICASE )
         flagsRE |= REG_ICASE;
     if ( flags & wxRE_NOSUB )

diff --git a/src/common/valgen.cpp b/src/common/valgen.cpp
index e38f6789bdc55571411313d03ecd4eb8ea36d756..37cefb5e74435debbe15ef6b5e633e0427c05140 100644 (file)
--- a/src/common/valgen.cpp
+++ b/src/common/valgen.cpp
@@ -370,7 +370,8 @@ bool wxGenericValidator::TransferToWindow(void)
         }
     } else
 #endif
-        ;   // to match the last 'else' above
+    {   // to match the last 'else' above
+    }
 
   // unrecognized control, or bad pointer
   return false;

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index ecac929db9e95567fcf88cc25c1249c1c0e743e1..5d4bcc8771306241672d2f08461a83bbe38ab66c 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -1080,7 +1080,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 
     // open file
     // ---------
-    bool bOk wxDUMMY_INITIALIZE(false);
+    bool bOk = false;
     if ( wxFile::Exists(filename) ) {
         bool bAppend = false;
         wxString strMsg;

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 704d6244e309514527c36ce0d653bd2e55fd1440..c869dd68a173e8207c80216a94584686b0a71a11 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -208,9 +208,9 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     if (factory->HasStatusLine())
     {
         flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
-            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+            0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );
         flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
-            0, wxALIGN_CENTER_VERTICAL|wxALL-wxTOP, 5 );
+            0, wxALIGN_CENTER_VERTICAL|(wxALL-wxTOP), 5 );
     }
 
     mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
@@ -361,10 +361,12 @@ bool wxGenericPrintDialog::TransferDataToWindow()
              if (m_printDialogData.GetToPage() > 0)
                 m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
              if(m_rangeRadioBox)
+             {
                 if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
                    m_rangeRadioBox->SetSelection(0);
                 else
                    m_rangeRadioBox->SetSelection(1);
+             }
           }
           else
           {

diff --git a/src/generic/vscroll.cpp b/src/generic/vscroll.cpp
index a948519a9aa731cfe20d4b5cc425c890eaf463e4..50bb4c1c6d1785eb567cc2bd951faa59580e8f6a 100644 (file)
--- a/src/generic/vscroll.cpp
+++ b/src/generic/vscroll.cpp
@@ -592,8 +592,8 @@ bool wxVarScrollHelperBase::DoScrollToUnit(size_t unit)
     // finally refresh the display -- but only redraw as few units as possible
     // to avoid flicker.  We can't do this if we have children because they
     // won't be scrolled
-    if ( m_targetWindow->GetChildren().empty() &&
-         GetVisibleBegin() >= unitLastOld || GetVisibleEnd() <= unitFirstOld )
+    if ( (m_targetWindow->GetChildren().empty() &&
+         GetVisibleBegin() >= unitLastOld) || GetVisibleEnd() <= unitFirstOld )
     {
         // the simplest case: we don't have any old units left, just redraw
         // everything

diff --git a/src/gtk/bitmap.cpp b/src/gtk/bitmap.cpp
index b1fe2f76f113f66e025fd31b85c614808489f4e4..18fb4f02b0fa9542b29c288a14c84dbe126f0eed 100644 (file)
--- a/src/gtk/bitmap.cpp
+++ b/src/gtk/bitmap.cpp
@@ -902,8 +902,8 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     const bool hasAlpha = HasAlpha();
     // allow access if bpp is valid and matches existence of alpha
     if (pixbuf != NULL && (
-        bpp == 24 && !hasAlpha ||
-        bpp == 32 && hasAlpha))
+        (bpp == 24 && !hasAlpha) ||
+        (bpp == 32 && hasAlpha)))
     {
         data.m_height = gdk_pixbuf_get_height( pixbuf );
         data.m_width = gdk_pixbuf_get_width( pixbuf );

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index f31a76fe73ba58ff1014164d23c6c7270de1dcc6..f7c7bf4e249a7b60448a8eeba610c18cedc0e401 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -500,11 +500,11 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar)
         case GDK_KP_7:
         case GDK_KP_8:
         case GDK_KP_9:
-            key_code = (isChar ? '0' : WXK_NUMPAD0) + keysym - GDK_KP_0;
+            key_code = (isChar ? '0' : int(WXK_NUMPAD0)) + keysym - GDK_KP_0;
             break;
 
         case GDK_KP_Space:
-            key_code = isChar ? ' ' : WXK_NUMPAD_SPACE;
+            key_code = isChar ? ' ' : int(WXK_NUMPAD_SPACE);
             break;
 
         case GDK_KP_Tab:
@@ -576,32 +576,32 @@ static long wxTranslateKeySymToWXKey(KeySym keysym, bool isChar)
             break;
 
         case GDK_KP_Equal:
-            key_code = isChar ? '=' : WXK_NUMPAD_EQUAL;
+            key_code = isChar ? '=' : int(WXK_NUMPAD_EQUAL);
             break;
 
         case GDK_KP_Multiply:
-            key_code = isChar ? '*' : WXK_NUMPAD_MULTIPLY;
+            key_code = isChar ? '*' : int(WXK_NUMPAD_MULTIPLY);
             break;
 
         case GDK_KP_Add:
-            key_code = isChar ? '+' : WXK_NUMPAD_ADD;
+            key_code = isChar ? '+' : int(WXK_NUMPAD_ADD);
             break;
 
         case GDK_KP_Separator:
             // FIXME: what is this?
-            key_code = isChar ? '.' : WXK_NUMPAD_SEPARATOR;
+            key_code = isChar ? '.' : int(WXK_NUMPAD_SEPARATOR);
             break;
 
         case GDK_KP_Subtract:
-            key_code = isChar ? '-' : WXK_NUMPAD_SUBTRACT;
+            key_code = isChar ? '-' : int(WXK_NUMPAD_SUBTRACT);
             break;
 
         case GDK_KP_Decimal:
-            key_code = isChar ? '.' : WXK_NUMPAD_DECIMAL;
+            key_code = isChar ? '.' : int(WXK_NUMPAD_DECIMAL);
             break;
 
         case GDK_KP_Divide:
-            key_code = isChar ? '/' : WXK_NUMPAD_DIVIDE;
+            key_code = isChar ? '/' : int(WXK_NUMPAD_DIVIDE);
             break;
 
 

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index aae4eaa57937d9133e1120aaff521cba41693874..1a855ee7dec59590b894c577f7855f6ffad433b3 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -875,7 +875,7 @@ wxRichTextLine* wxRichTextParagraphLayoutBox::GetLineAtPosition(long pos, bool c
 
                     // If the position is end-of-paragraph, then return the last line of
                     // of the paragraph.
-                    (range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd()))
+                    ((range.GetEnd() == child->GetRange().GetEnd()-1) && (pos == child->GetRange().GetEnd())))
                     return line;
 
                 node2 = node2->GetNext();
@@ -5943,7 +5943,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t
     while (node)
     {
         wxRichTextFileHandler* handler = (wxRichTextFileHandler*) node->GetData();
-        if (handler->IsVisible() && ((save && handler->CanSave()) || !save && handler->CanLoad()))
+        if (handler->IsVisible() && ((save && handler->CanSave()) || (!save && handler->CanLoad())))
         {
             if (combine)
             {
@@ -7774,6 +7774,7 @@ wxRichTextFontTable::wxRichTextFontTable()
 }
 
 wxRichTextFontTable::wxRichTextFontTable(const wxRichTextFontTable& table)
+    : wxObject()
 {
     (*this) = table;
 }