Fix some GCC 3.2 -O2 warnings.

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 39f2fbd14550a49d1d8808704d26d4f6194551c9..36bb252b1708000c5ba9a6a64929dc9af10cf244 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -126,8 +126,7 @@ public:
 
     wxVectorBase& operator = (const wxVectorBase& vb)
     {
-        bool rc = copy(vb);
-        wxASSERT(rc);
+        wxCHECK(copy(vb), *this);
         return *this;
     }
 };
@@ -146,8 +145,7 @@ public:\
     cls() {}\
     cls(const cls& c)\
     {\
-        bool rc = copy(c);\
-        wxASSERT(rc);\
+        wxCHECK2(copy(c), return);\
     }\
     ~cls()\
     {\
@@ -161,8 +159,7 @@ class exp cls : public wxVectorBase\
 public:\
     void push_back(const obj& o)\
     {\
-        bool rc = Alloc(size() + 1);\
-        wxASSERT(rc);\
+        wxCHECK2(Alloc(size() + 1), return);\
         Append(new obj(o));\
     };\
     void pop_back()\

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 0e194c6ba3c6bf38b431aaee5aaedae22a20078e..6709d10e0b6246ac46897cb4cff7f4166a542114 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -285,7 +285,7 @@ bool wxTextCtrlBase::EmulateKeyPress(const wxKeyEvent& event)
 {
     // the generic version is unused in wxMSW
 #ifndef __WIN32__
-    wxChar ch;
+    wxChar ch = 0;
     int keycode = event.GetKeyCode();
     switch ( keycode )
     {

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 988efef17689b13fb0cf2ea8b55afa47104fdef7..c4ea2a4f4edcb7530b132cae6230eac8ca76308e 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -151,9 +151,11 @@ void wxFileSelOk(Widget WXUNUSED(fs), XtPointer WXUNUSED(client_data), XmFileSel
 
 static wxString ParseWildCard( const wxString& wild )
 {
+#ifdef __WXDEBUG__
     static const wxChar* msg =
         _T("Motif file dialog does not understand this ")
         _T("wildcard syntax");
+#endif
 
     wxStringTokenizer tok( wild, _T("|") );
 

diff --git a/src/motif/spinbutt.cpp b/src/motif/spinbutt.cpp
index 2ad0e3b7745c159b5a6a778d4d71695c822ebbc7..426310515628c08c718902f8f1ddfde093d61c9d 100644 (file)
--- a/src/motif/spinbutt.cpp
+++ b/src/motif/spinbutt.cpp
@@ -183,7 +183,7 @@ bool wxArrowButton::Create( wxSpinButton* parent, wxWindowID id,
                             ArrowDirection d,
                             const wxPoint& pos, const wxSize& size )
 {
-    int arrow_dir;
+    int arrow_dir = XmARROW_UP;
 
     switch( d )
     {