Removed warnings

  Added GetCount() to wxList and wxDaynArray

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

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 1afdd853160cdfe26a84177f4c64281e24ff58fd..94dc5e1798c36a2fa0e7d4a425af8f06920a7046 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -97,6 +97,7 @@ public:
   //@{
     /// number of elements in the array
   size_t  Count() const   { return m_uiCount;      }
+  size_t  GetCount() const   { return m_uiCount;      }
     /// is it empty?
   bool  IsEmpty() const { return m_uiCount == 0; }
   //@}

diff --git a/include/wx/list.h b/include/wx/list.h
index 1a04556ba98c3b31b07c2fe2d72e9a622772f911..61466cd3aaffa5122fd1ed74dbef48b3a0c032fe 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -79,6 +79,7 @@ class WXDLLEXPORT wxList: public wxObject
   ~wxList(void);
 
   inline int Number(void) const { return n; }
+  inline int GetCount(void) const { return n; }
 
   // Append to end of list
   wxNode *Append(wxObject *object);

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 1542d084eb758bb1e8db0590a108b8996fca1b6a..aa9618a3c604f2d1223748c2470381d5153ccb4e 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -144,17 +144,17 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   m_leftWindow2 = win;
 }
 
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
       Close(TRUE);
 }
 
-void MyFrame::OnAbout(wxCommandEvent& event)
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
       (void)wxMessageBox("wxWindows 2.0 Sash Demo\nAuthor: Julian Smart (c) 1998", "About Sash Demo");
 }
 
-void MyFrame::OnToggleWindow(wxCommandEvent& event)
+void MyFrame::OnToggleWindow(wxCommandEvent& WXUNUSED(event))
 {
     if (m_leftWindow1->IsShown())
     {
@@ -203,7 +203,7 @@ void MyFrame::OnSashDrag(wxSashEvent& event)
     GetClientWindow()->Refresh();
 }
 
-void MyFrame::OnNewWindow(wxCommandEvent& event)
+void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event))
 {
       // Make another frame, containing a canvas
       MyChild *subframe = new MyChild(frame, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
@@ -329,7 +329,7 @@ bool MyFrame::OnClose(void)
   return TRUE;
 }
 
-void MyFrame::OnSize(wxSizeEvent& event)
+void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
 {
     wxLayoutAlgorithm layout;
     layout.LayoutMDIFrame(this);

diff --git a/src/Makefile.in b/src/Makefile.in
index 370902040a473aad90491499c324c6749b17f7e8..5caeef4a469fe69d9db98c3f60e434452b041532 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -95,7 +95,7 @@ install::
        @cd $(WXBASEDIR)/lib/$(OS) ; \
          rm -f $(libdir)/$(STATIC_LIBRARY) ; \
          $(INSTALL_DATA) $(STATIC_LIBRARY) $(libdir)/$(STATIC_LIBRARY)
-       @if test $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
+       @if test -f $(WXBASEDIR)/lib/$(OS)/$(SHARED_LIBRARY) ; then \
          echo "  Copying shared library" ; \
          cd $(WXBASEDIR)/lib/$(OS) ; \
            rm -f $(libdir)/lib$(LIB_TARGET).so* ; \

diff --git a/src/common/config.cpp b/src/common/config.cpp
index ec03c728f62b21792a89b59ac4409e0d0aad47a8..e099f0af2ce630f068cd833059b39a7f66f61156 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -71,7 +71,7 @@ bool          wxConfigBase::ms_bAutoCreate = TRUE;
 // Not all args will always be used by derived classes, but
 // including them all in each class ensures compatibility.
 wxConfigBase::wxConfigBase(const wxString& appName, const wxString& vendorName,
-    const wxString& localFilename, const wxString& globalFilename, long style):
+    const wxString& WXUNUSED(localFilename), const wxString& WXUNUSED(globalFilename), long style):
         m_appName(appName), m_vendorName(vendorName), m_style(style)
 {
     m_bExpandEnvVars = TRUE; m_bRecordDefaults = FALSE;

diff --git a/src/common/file.cpp b/src/common/file.cpp
index f3fd151385c1e8b0ef655d9fa109c3fb76698d4a..6cb6e3f0592cd1f37e648b66918c8ce01a0f02df 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -132,7 +132,7 @@ bool wxFile::Exists(const char *name)
 
 bool wxFile::Access(const char *name, OpenMode mode)
 {
-  int how;
+  int how = 0;
 
   switch ( mode ) {
     case read:

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 6af8892fcd8bdb77356f2fdc54008922661fb26d..6a1848932c0e2dbe112e6de3f64919f4fcaa4810 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -772,11 +772,11 @@ wxFrame *wxLogWindow::GetFrame() const
   return m_pLogFrame;
 }
 
-void wxLogWindow::OnFrameCreate(wxFrame *frame)
+void wxLogWindow::OnFrameCreate(wxFrame *WXUNUSED(frame))
 {
 }
 
-void wxLogWindow::OnFrameDelete(wxFrame *frame)
+void wxLogWindow::OnFrameDelete(wxFrame *WXUNUSED(frame))
 {
   m_pLogFrame = (wxLogFrame *) NULL;
 }

diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index de925cc2eac3020284b105308aefc55ed408c1b2..3e921cc2e7c767c7ba3737a3557f0bd6e382a757 100644 (file)
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -614,7 +614,7 @@ bool wxRecordSet::GetResultSet(void)
     field1->SetType(type);
     field1->SetSize(len);
     
-    SQLBindCol(hStmt, i+1, SQL_C_BINARY, field1->GetData(), field1->GetSize(), &trash);
+    SQLBindCol(hStmt, i+1, SQL_C_BINARY, (unsigned char*)field1->GetData(), field1->GetSize(), &trash);
   }
   
   switch (type) {

diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index e8e5b5bef19f473a6abd60bdcc1ef45188dddd22..f85a94d553849bf94165732ce68b4542992a9978 100644 (file)
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -2050,11 +2050,15 @@ wxDialog(parent, -1, title, pos, size, style)
   int yPos = 40;
 
 #if defined(__WXGTK__) || defined (__WXMOTIF__)
-  (void) new wxStaticText(this, -1, _("Printer Command: "), wxPoint(5, yPos));
-  wxTextCtrl *text_prt = new wxTextCtrl(this, wxID_PRINTER_COMMAND, wxThePrintSetupData->GetPrinterCommand(), wxPoint(100, yPos), wxSize(100, -1));
+  (void) new wxStaticText( this, -1, _("Printer Command: "), 
+                           wxPoint(5, yPos) );
+  (void) new wxTextCtrl( this, wxID_PRINTER_COMMAND, wxThePrintSetupData->GetPrinterCommand(), 
+                         wxPoint(100, yPos), wxSize(100, -1) );
   
-  (void) new wxStaticText(this, -1, _("Printer Options: "), wxPoint(210, yPos));
-  wxTextCtrl *text0 = new wxTextCtrl(this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(), wxPoint(305, yPos), wxSize(150, -1));
+  (void) new wxStaticText( this, -1, _("Printer Options: "), 
+                           wxPoint(210, yPos) );
+  (void) new wxTextCtrl( this, wxID_PRINTER_OPTIONS, wxThePrintSetupData->GetPrinterOptions(), 
+                         wxPoint(305, yPos), wxSize(150, -1) );
 
   yPos += 40;
 #endif

diff --git a/src/common/wxexpr.cpp b/src/common/wxexpr.cpp
index 926cae30013f5f40888956fab62d06c1343a340a..f03b2900b784ab04bf943b00bbd3d1b9c9b3eb3d 100644 (file)
--- a/src/common/wxexpr.cpp
+++ b/src/common/wxexpr.cpp
@@ -1230,7 +1230,7 @@ void process_command(char * cexpr)
   add_expr(expr);
 }
 
-void syntax_error(char *s)
+void syntax_error(char *WXUNUSED(s))
 {
   if (currentwxExprErrorHandler)
     (void)(*(currentwxExprErrorHandler))(WXEXPR_ERROR_SYNTAX, "syntax error");