applied patch #929947: "Various cleaning of warnings under MSW"; removed some tabs

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

diff --git a/contrib/samples/ogl/studio/shapes.h b/contrib/samples/ogl/studio/shapes.h
index 117721dfbe0b1e831e5771e63a070a4f04816fbf..26ca01fbe70bfcb33e940469830ba869d2f19a22 100644 (file)
--- a/contrib/samples/ogl/studio/shapes.h
+++ b/contrib/samples/ogl/studio/shapes.h
@@ -73,8 +73,8 @@ public:
 
 // Overridables
     // Start/end copying
 
 // Overridables
     // Start/end copying

-    virtual bool OnStartCopy(wxDiagram* diagramTo) { return TRUE; };
-    virtual bool OnEndCopy(wxDiagram* diagramTo) { return TRUE; };
+    virtual bool OnStartCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };
+    virtual bool OnEndCopy(wxDiagram* WXUNUSED(diagramTo)) { return TRUE; };

 
     // Override this to e.g. have the shape added through a Do/Undo command system.
     // By default, we'll just add it directly to the destination diagram, and
 
     // Override this to e.g. have the shape added through a Do/Undo command system.
     // By default, we'll just add it directly to the destination diagram, and


@@ -97,10 +97,10 @@ public:
     ~csDiagramClipboard() {}
 
     // Start/end copying
     ~csDiagramClipboard() {}
 
     // Start/end copying

-    bool OnStartCopy(wxDiagram* diagramTo);
-    bool OnEndCopy(wxDiagram* diagramTo);
+    virtual bool OnStartCopy(wxDiagram* diagramTo);
+    virtual bool OnEndCopy(wxDiagram* diagramTo);

 
 

-    bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);
+    virtual bool OnAddShape(wxDiagram* diagramTo, wxShape* newShape, wxDC* dc);

 
 protected:
     csDiagramCommand*   m_currentCmd;
 
 protected:
     csDiagramCommand*   m_currentCmd;

diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index 95e02cb53a3be9193ddd6794b6e2a9bdb122ea92..8c027c108e54a5c743039fb10a2ae0254eca95cb 100644 (file)
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.cpp
@@ -594,7 +594,7 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
   wxRealPoint *second_last_line_point = (wxRealPoint *)second_last_line_node->GetData();
 
   // Position where we want to start drawing
   wxRealPoint *second_last_line_point = (wxRealPoint *)second_last_line_node->GetData();
 
   // Position where we want to start drawing

-  double positionOnLineX, positionOnLineY;
+  double positionOnLineX = 0.0, positionOnLineY = 0.0;

 
   // Position of start point of line, at the end of which we draw the arrow.
   double startPositionX = 0.0 , startPositionY = 0.0;
 
   // Position of start point of line, at the end of which we draw the arrow.
   double startPositionX = 0.0 , startPositionY = 0.0;


@@ -1090,8 +1090,8 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
 
   // Do each end - nothing in the middle. User has to move other points
   // manually if necessary.
 
   // Do each end - nothing in the middle. User has to move other points
   // manually if necessary.

-  double end_x, end_y;
-  double other_end_x, other_end_y;
+  double end_x = 0.0, end_y = 0.0;
+  double other_end_x = 0.0, other_end_y = 0.0;

 
   wxNode *first = m_lineControlPoints->GetFirst();
   /* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();
 
   wxNode *first = m_lineControlPoints->GetFirst();
   /* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();

diff --git a/contrib/src/xrc/xmlres.cpp b/contrib/src/xrc/xmlres.cpp
index bbe8ce47c56145c5d2df065b091b792d4d5b915d..d9b2c4afff46ab1412cdde7e4a1db1088fc39fbe 100644 (file)
--- a/contrib/src/xrc/xmlres.cpp
+++ b/contrib/src/xrc/xmlres.cpp
@@ -989,7 +989,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
     wxString s = GetParamValue(param);
     if (s.IsEmpty()) s = wxT("-1,-1");
     bool is_dlg;
     wxString s = GetParamValue(param);
     if (s.IsEmpty()) s = wxT("-1,-1");
     bool is_dlg;

-    long sx, sy;
+    long sx, sy = 0;

 
     is_dlg = s[s.Length()-1] == wxT('d');
     if (is_dlg) s.RemoveLast();
 
     is_dlg = s[s.Length()-1] == wxT('d');
     if (is_dlg) s.RemoveLast();

diff --git a/contrib/utils/wxrcedit/nodehnd.h b/contrib/utils/wxrcedit/nodehnd.h
index 945bc76d656709be9ed81d914dcc57d773777e7d..bfc98bea7374da4f8cf0e6ac166a94b6146af0da 100644 (file)
--- a/contrib/utils/wxrcedit/nodehnd.h
+++ b/contrib/utils/wxrcedit/nodehnd.h
@@ -123,7 +123,7 @@ class NodeHandlerUnknown : public NodeHandler
     public:
         NodeHandlerUnknown() : NodeHandler(new NodeInfo) {}
         
     public:
         NodeHandlerUnknown() : NodeHandler(new NodeInfo) {}
         

-        virtual bool CanHandle(wxXmlNode *node) { return TRUE; }
+        virtual bool CanHandle(wxXmlNode *WXUNUSED(node)) { return TRUE; }

 };
 
 
 };
 
 

diff --git a/contrib/utils/wxrcedit/pe_basic.cpp b/contrib/utils/wxrcedit/pe_basic.cpp
index ab467eb4537186a324fc3f46b036b951e200c9e7..9e64192419efb6e8fdd9328b0abe5959e9691fdd 100644 (file)
--- a/contrib/utils/wxrcedit/pe_basic.cpp
+++ b/contrib/utils/wxrcedit/pe_basic.cpp
@@ -192,13 +192,13 @@ class PropEditCtrlCoordXY : public PropEditCtrlInt
             return m_c[m_which];
         }
         
             return m_c[m_which];
         }
         

-        virtual wxString GetPropName(const PropertyInfo& pinfo)
+        virtual wxString GetPropName(const PropertyInfo& WXUNUSED(pinfo))

         {
             if (m_which == 0) return _T("x"); else return _T("y");
         }
 
         virtual bool HasClearButton() { return FALSE; }
         {
             if (m_which == 0) return _T("x"); else return _T("y");
         }
 
         virtual bool HasClearButton() { return FALSE; }

-        virtual bool IsPresent(const PropertyInfo& pinfo) { return FALSE; } 
+        virtual bool IsPresent(const PropertyInfo& WXUNUSED(pinfo)) { return FALSE; } 

 
     
     protected:
 
     
     protected:


@@ -243,13 +243,13 @@ class PropEditCtrlCoordDlg : public PropEditCtrlBool
                 return _("true");
         }
         
                 return _("true");
         }
         

-        virtual wxString GetPropName(const PropertyInfo& pinfo)
+        virtual wxString GetPropName(const PropertyInfo& WXUNUSED(pinfo))

         {
             return _T("dlg");
         }
 
         virtual bool HasClearButton() { return FALSE; }
         {
             return _T("dlg");
         }
 
         virtual bool HasClearButton() { return FALSE; }

-        virtual bool IsPresent(const PropertyInfo& pinfo) { return FALSE; } 
+        virtual bool IsPresent(const PropertyInfo& WXUNUSED(pinfo)) { return FALSE; } 

 };
 
 
 };
 
 


@@ -318,13 +318,13 @@ class PropEditCtrlDimX : public PropEditCtrlInt
             return XmlReadValue(GetNode(), pi->Name).BeforeFirst(_T('d'));
         }
         
             return XmlReadValue(GetNode(), pi->Name).BeforeFirst(_T('d'));
         }
         

-        virtual wxString GetPropName(const PropertyInfo& pinfo)
+        virtual wxString GetPropName(const PropertyInfo& WXUNUSED(pinfo))

         {
             return _T("val");
         }
 
         virtual bool HasClearButton() { return FALSE; }
         {
             return _T("val");
         }
 
         virtual bool HasClearButton() { return FALSE; }

-        virtual bool IsPresent(const PropertyInfo& pinfo) { return FALSE; } 
+        virtual bool IsPresent(const PropertyInfo& WXUNUSED(pinfo)) { return FALSE; } 

 
     
     protected:
 
     
     protected:

diff --git a/contrib/utils/wxrcedit/pe_basic.h b/contrib/utils/wxrcedit/pe_basic.h
index 10ed2027395f44a70b9f834028b6009f511d9352..5dff7dde762a97b573d0a48d9fa9cc0455834c79 100644 (file)
--- a/contrib/utils/wxrcedit/pe_basic.h
+++ b/contrib/utils/wxrcedit/pe_basic.h
@@ -26,7 +26,7 @@ class PropEditCtrlNull : public PropEditCtrl
         PropEditCtrlNull(PropertiesFrame *propFrame)
            : PropEditCtrl(propFrame) {}
                 
         PropEditCtrlNull(PropertiesFrame *propFrame)
            : PropEditCtrl(propFrame) {}
                 

-        virtual void BeginEdit(const wxRect& rect, wxTreeItemId ti) {}
+        virtual void BeginEdit(const wxRect& WXUNUSED(rect), wxTreeItemId WXUNUSED(ti)) {}

         virtual void EndEdit() {}
                 
         virtual wxWindow* CreateEditCtrl() {return NULL;}
         virtual void EndEdit() {}
                 
         virtual wxWindow* CreateEditCtrl() {return NULL;}

diff --git a/demos/dbbrowse/browsedb.cpp b/demos/dbbrowse/browsedb.cpp
index 9583c776b1b089dcfff5adeab9b057ef6db2419c..f5ee9c86f6f07348dcec31af465ddfd12ef895ec 100644 (file)
--- a/demos/dbbrowse/browsedb.cpp
+++ b/demos/dbbrowse/browsedb.cpp
@@ -1,12 +1,12 @@
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------

-// Name:               BrowserDB.h,cpp
-// Purpose:    a wxDB class
-// Author:             Mark Johnson
+// Name:        BrowserDB.h,cpp
+// Purpose:     a wxDB class
+// Author:      Mark Johnson

 // Modified by:
 // Modified by:

-// Created:    19991127.mj10777
-// Copyright:  (c) Mark Johnson
-// Licence:    wxWindows license
-// RCS-ID:             $Id$
+// Created:     19991127.mj10777
+// Copyright:   (c) Mark Johnson
+// Licence:     wxWindows license
+// RCS-ID:      $Id$

 //----------------------------------------------------------------------------------------
 //-- 1)
 //----------------------------------------------------------------------------------------
 //----------------------------------------------------------------------------------------
 //-- 1)
 //----------------------------------------------------------------------------------------


@@ -38,7 +38,7 @@ wxDbConnectInf DbConnectInf;
 #endif
 
 //----------------------------------------------------------------------------------------
 #endif
 
 //----------------------------------------------------------------------------------------

-extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList;       /* from db.cpp, used in getting back error results from db connections */
+extern WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList;    /* from db.cpp, used in getting back error results from db connections */

 
 //----------------------------------------------------------------------------------------
 wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)
 
 //----------------------------------------------------------------------------------------
 wxChar *GetExtendedDBErrorMsg(wxChar *ErrFile, int ErrLine)


@@ -127,8 +127,8 @@ bool BrowserDB::OnStartDB(int Quiet)
     //---------------------------------------------------------------------------------------
     DlgUser *p_Dlg;
     p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,_T(""));
     //---------------------------------------------------------------------------------------
     DlgUser *p_Dlg;
     p_Dlg = new DlgUser(pDoc->p_MainFrame,pDoc,_T(""));

-    p_Dlg->s_DSN         = ODBCSource;
-    p_Dlg->s_User        = UserName;
+    p_Dlg->s_DSN      = ODBCSource;
+    p_Dlg->s_User     = UserName;

     p_Dlg->s_Password = Password;
     p_Dlg->OnInit();
     p_Dlg->Fit();
     p_Dlg->s_Password = Password;
     p_Dlg->OnInit();
     p_Dlg->Fit();


@@ -146,9 +146,9 @@ bool BrowserDB::OnStartDB(int Quiet)
     if (OK)
     {
         //--------------------------------------------------------------------------------------
     if (OK)
     {
         //--------------------------------------------------------------------------------------

-        DbConnectInf.SetDsn(ODBCSource);                 // ODBC data source name (created with ODBC Administrator under Win95/NT)
-        DbConnectInf.SetUserID(UserName);            // database username - must already exist in the data source
-        DbConnectInf.SetPassword(Password);      // password database username
+        DbConnectInf.SetDsn(ODBCSource);         // ODBC data source name (created with ODBC Administrator under Win95/NT)
+        DbConnectInf.SetUserID(UserName);        // database username - must already exist in the data source
+        DbConnectInf.SetPassword(Password);      // password database username

         db_BrowserDB = wxDbGetConnection(&DbConnectInf);
         // wxLogMessage(">>>%s<<<>>>%s<<<",UserName.c_str(),Password.c_str());
         if (db_BrowserDB == NULL)
         db_BrowserDB = wxDbGetConnection(&DbConnectInf);
         // wxLogMessage(">>>%s<<<>>>%s<<<",UserName.c_str(),Password.c_str());
         if (db_BrowserDB == NULL)


@@ -204,12 +204,11 @@ bool BrowserDB::OnCloseDB(int Quiet)
 bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
 {
     SDWORD cb;
 bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
 {
     SDWORD cb;

-    int         i_dbDataType;
-    int   i=0;
+    int i_dbDataType;

     wxChar s_temp[1024+1];
     wxChar s_temp[1024+1];

-    long                        l_temp;
-    double                      f_temp;
-    int                         AnzError=0;
+    long l_temp;
+    double f_temp;
+    int AnzError=0;

     TIMESTAMP_STRUCT t_temp;
     wxString Temp0;
     //-----------------------------
     TIMESTAMP_STRUCT t_temp;
     wxString Temp0;
     //-----------------------------


@@ -225,14 +224,15 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
     }
     else
     {
     }
     else
     {

+        int i;

         for (i=0;i<Cols;i++)
         {
             wxStrcpy((cl_BrowserDB+i)->tableName,_T("-E->"));
             i_dbDataType = (cl_BrowserDB+i)->pColFor->i_dbDataType;
         for (i=0;i<Cols;i++)
         {
             wxStrcpy((cl_BrowserDB+i)->tableName,_T("-E->"));
             i_dbDataType = (cl_BrowserDB+i)->pColFor->i_dbDataType;

-            if (i_dbDataType == 0)                                               // Filter unsupported dbDataTypes
+            if (i_dbDataType == 0)         // Filter unsupported dbDataTypes

             {
                 if (((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_VARCHAR) ||
             {
                 if (((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_VARCHAR) ||

-                                                 ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_LONGVARCHAR))
+                          ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_LONGVARCHAR))

                     i_dbDataType = DB_DATA_TYPE_VARCHAR;
                 if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DATE)
                     i_dbDataType = DB_DATA_TYPE_DATE;
                     i_dbDataType = DB_DATA_TYPE_VARCHAR;
                 if ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DATE)
                     i_dbDataType = DB_DATA_TYPE_DATE;


@@ -244,8 +244,8 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
                     i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             if ((i_dbDataType == DB_DATA_TYPE_INTEGER) &&
                     i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             if ((i_dbDataType == DB_DATA_TYPE_INTEGER) &&

-                                        ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DOUBLE))
-            {  // DBASE Numeric
+                     ((cl_BrowserDB+i)->pColFor->i_sqlDataType == SQL_C_DOUBLE))
+            {    // DBASE Numeric

                 i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             switch(i_dbDataType)
                 i_dbDataType = DB_DATA_TYPE_FLOAT;
             }
             switch(i_dbDataType)


@@ -298,8 +298,8 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
                 else
                 {
                     // i_Nation =  0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
                 else
                 {
                     // i_Nation =  0 = timestamp , 1=EU, 2=UK, 3=International, 4=US

-                    if (((cl_BrowserDB+i)->pColFor->i_Nation == 0)     ||      // TS  YYYY-MM-DD
-                        ((cl_BrowserDB+i)->pColFor->i_Nation == 3))    // IT  YYYY-MM-DD
+                    if (((cl_BrowserDB+i)->pColFor->i_Nation == 0)    ||    // TS  YYYY-MM-DD
+                        ((cl_BrowserDB+i)->pColFor->i_Nation == 3))     // IT  YYYY-MM-DD

                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.year,t_temp.month,t_temp.day,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.year,t_temp.month,t_temp.day,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);


@@ -312,7 +312,7 @@ bool BrowserDB::OnGetNext(int Cols,int WXUNUSED(Quiet))
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                         wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
                     }
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                         wxStrcpy((cl_BrowserDB+i)->tableName,Temp0.c_str());
                     }

-                    if ((cl_BrowserDB+i)->pColFor->i_Nation == 3)         // US  MM/DD/YYYY
+                    if ((cl_BrowserDB+i)->pColFor->i_Nation == 3)    // US  MM/DD/YYYY

                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.month,t_temp.day,t_temp.year,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);
                     {
                         Temp0.Printf((cl_BrowserDB+i)->pColFor->s_Field,t_temp.month,t_temp.day,t_temp.year,
                             t_temp.hour, t_temp.minute, t_temp.second, t_temp.fraction);


@@ -452,10 +452,10 @@ void BrowserDB::PointerToNULL(int Art)
             delete db_BrowserDB;
         }
     }
             delete db_BrowserDB;
         }
     }

-    cl_BrowserDB          = NULL;
-    ct_BrowserDB          = NULL;
-    db_BrowserDB          = NULL;
-    p_LogWindow           = NULL;
+    cl_BrowserDB       = NULL;
+    ct_BrowserDB       = NULL;
+    db_BrowserDB       = NULL;
+    p_LogWindow        = NULL;

 }
 
 //----------------------------------------------------------------------------------------
 }
 
 //----------------------------------------------------------------------------------------

diff --git a/demos/dbbrowse/tabpgwin.h b/demos/dbbrowse/tabpgwin.h
index da008ddefcd92a7d871523fabc60fe19fb11f243..f6f63e74e12ea536a586f86cc692f4bfb325a806 100644 (file)
--- a/demos/dbbrowse/tabpgwin.h
+++ b/demos/dbbrowse/tabpgwin.h
@@ -89,7 +89,7 @@ public:
 
  // notifications (can be handled by derivatives)
 
 
  // notifications (can be handled by derivatives)
 

- virtual void OnTabAdded( twTabInfo* pInfo ) {}
+ virtual void OnTabAdded( twTabInfo* WXUNUSED(pInfo) ) {}

 
  virtual void SizeTabs(int x,int y, int width, int height, bool repant);
 
 
  virtual void SizeTabs(int x,int y, int width, int height, bool repant);
 

diff --git a/demos/life/game.cpp b/demos/life/game.cpp
index a8be0b96e87fa9aae791c2f35731a38979fbe59e..5b7e6ce79aec25985e399d1328206d96bc130f70 100644 (file)
--- a/demos/life/game.cpp
+++ b/demos/life/game.cpp
@@ -75,9 +75,9 @@ public:
 bool LifeCellBox::IsAlive(int dx, int dy) const
 {
     if (dy > 3)
 bool LifeCellBox::IsAlive(int dx, int dy) const
 {
     if (dy > 3)

-        return (m_live2 & 1 << ((dy - 4) * 8 + dx));
+        return (bool)(m_live2 & 1 << ((dy - 4) * 8 + dx));

     else
     else

-        return (m_live1 & 1 << ((dy) * 8 + dx));
+        return (bool)(m_live1 & 1 << ((dy) * 8 + dx));

 }
 
 // SetCell:
 }
 
 // SetCell:

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index 6790045247e4fb47069d1bf9101f38edaabcd58b..7c707d492879213b30232cfc97d7f90459f2fd4b 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -82,7 +82,7 @@ class URLDropTarget : public wxDropTarget
 public:
     URLDropTarget() { SetDataObject(new wxURLDataObject); }
 
 public:
     URLDropTarget() { SetDataObject(new wxURLDataObject); }
 

-    void OnDropURL(wxCoord x, wxCoord y, const wxString& text)
+    void OnDropURL(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxString& text)

     {
         // of course, a real program would do something more useful here...
         wxMessageBox(text, _T("wxDnD sample: got URL"),
     {
         // of course, a real program would do something more useful here...
         wxMessageBox(text, _T("wxDnD sample: got URL"),


@@ -91,7 +91,7 @@ public:
 
     // URLs can't be moved, only copied
     virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
 
     // URLs can't be moved, only copied
     virtual wxDragResult OnDragOver(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),

-                                    wxDragResult def)
+                                    wxDragResult WXUNUSED(def))

         {
             return wxDragLink;  // At least IE 5.x needs wxDragLink, the
                                 // other browsers on MSW seem okay with it too.
         {
             return wxDragLink;  // At least IE 5.x needs wxDragLink, the
                                 // other browsers on MSW seem okay with it too.


@@ -144,7 +144,7 @@ public:
         Refresh();
     }
 
         Refresh();
     }
 

-    void OnPaint(wxPaintEvent& event)
+    void OnPaint(wxPaintEvent& WXUNUSED(event))

     {
         wxPaintDC dc(this);
 
     {
         wxPaintDC dc(this);
 


@@ -613,7 +613,7 @@ public:
     }
 
     virtual bool SetData(const wxDataFormat& format,
     }
 
     virtual bool SetData(const wxDataFormat& format,

-                         size_t len, const void *buf)
+                         size_t WXUNUSED(len), const void *buf)

     {
         wxCHECK_MSG( format == m_formatShape, false,
                      wxT( "unsupported format") );
     {
         wxCHECK_MSG( format == m_formatShape, false,
                      wxT( "unsupported format") );

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 047299d82aaf3a83a198fc2bc6e88dbf4c529875..10242436c951889907f83b5554140a739dac516c 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -86,8 +86,8 @@ public:
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

-    void OnIncFont(wxCommandEvent& event) { DoResizeFont(+2); }
-    void OnDecFont(wxCommandEvent& event) { DoResizeFont(-2); }
+    void OnIncFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(+2); }
+    void OnDecFont(wxCommandEvent& WXUNUSED(event)) { DoResizeFont(-2); }

 
     void OnBold(wxCommandEvent& event);
     void OnItalic(wxCommandEvent& event);
 
     void OnBold(wxCommandEvent& event);
     void OnItalic(wxCommandEvent& event);

diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index ae4b8022e5eeaa33171da6b6788695e058d1a0c1..54ef746ff412e202f153852de3fb0fb53a3c08a0 100644 (file)
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -112,7 +112,7 @@ private:
         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t t)
+    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);


@@ -154,7 +154,7 @@ protected:
     void OnKeyUp(wxKeyEvent& event) { LogEvent(_T("Key up"), event); }
     void OnChar(wxKeyEvent& event) { LogEvent(_T("Char"), event); }
 
     void OnKeyUp(wxKeyEvent& event) { LogEvent(_T("Key up"), event); }
     void OnChar(wxKeyEvent& event) { LogEvent(_T("Char"), event); }
 

-    void OnPaint(wxPaintEvent& event)
+    void OnPaint(wxPaintEvent& WXUNUSED(event))

     {
         wxPaintDC dc(this);
         dc.SetTextForeground(*wxWHITE);
     {
         wxPaintDC dc(this);
         dc.SetTextForeground(*wxWHITE);

diff --git a/samples/listbox/lboxtest.cpp b/samples/listbox/lboxtest.cpp
index df14dbd815036562f0a4a310d8e5af24365fdf0b..0737d53278d445455a64df9b1c7acb731dd5b7fd 100644 (file)
--- a/samples/listbox/lboxtest.cpp
+++ b/samples/listbox/lboxtest.cpp
@@ -228,7 +228,7 @@ private:
         }
     }
 
         }
     }
 

-    virtual void DoLogString(const wxChar *szString, time_t t)
+    virtual void DoLogString(const wxChar *szString, time_t WXUNUSED(t))

     {
         wxString msg;
         TimeStamp(&msg);
     {
         wxString msg;
         TimeStamp(&msg);


@@ -526,7 +526,7 @@ void LboxTestFrame::CreateLbox()
             items.Add(m_lbox->GetString(n));
         }
 
             items.Add(m_lbox->GetString(n));
         }
 

-        m_sizerLbox->Remove(m_lbox);
+        m_sizerLbox->Detach(m_lbox);

         delete m_lbox;
     }
 
         delete m_lbox;
     }
 

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 35ce571e4b36c2afabe4b4b63d6d313d4a08abb2..35c057296e43e2c2a03ab8e85667d6a8598a07db 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -96,7 +96,7 @@ public:
     void UpdateClock();
 
     // event handlers
     void UpdateClock();
 
     // event handlers

-    void OnTimer(wxTimerEvent& event) { UpdateClock(); }
+    void OnTimer(wxTimerEvent& WXUNUSED(event)) { UpdateClock(); }

     void OnSize(wxSizeEvent& event);
     void OnToggleClock(wxCommandEvent& event);
     void OnButton(wxCommandEvent& event);
     void OnSize(wxSizeEvent& event);
     void OnToggleClock(wxCommandEvent& event);
     void OnButton(wxCommandEvent& event);

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index bbe8ce47c56145c5d2df065b091b792d4d5b915d..d9b2c4afff46ab1412cdde7e4a1db1088fc39fbe 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -989,7 +989,7 @@ wxSize wxXmlResourceHandler::GetSize(const wxString& param)
     wxString s = GetParamValue(param);
     if (s.IsEmpty()) s = wxT("-1,-1");
     bool is_dlg;
     wxString s = GetParamValue(param);
     if (s.IsEmpty()) s = wxT("-1,-1");
     bool is_dlg;

-    long sx, sy;
+    long sx, sy = 0;

 
     is_dlg = s[s.Length()-1] == wxT('d');
     if (is_dlg) s.RemoveLast();
 
     is_dlg = s[s.Length()-1] == wxT('d');
     if (is_dlg) s.RemoveLast();