Removed warnings from tbarsimpl

  Now wxSlider also works for negative values.
  wx-config reports 2.0.1
  made wxUSE_SOCKET default
  forgot to run autoconf

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

diff --git a/distrib/gtk/copy_src b/distrib/gtk/copy_src
index 1233b6aa0702be10c5cc7830dc43b3ba7ff430fc..7b8de3ba0ee8938c68dd046fe5bceb0aeacecfd4 100755 (executable)
--- a/distrib/gtk/copy_src
+++ b/distrib/gtk/copy_src
@@ -327,16 +327,16 @@ cp *.h ~/wxgtk_dist/wxGTK/samples/db
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/db
 cd ..
 
 cp *.xpm ~/wxgtk_dist/wxGTK/samples/db
 cd ..
 

-echo DDE sample..
-
-cd dde
-mkdir ~/wxgtk_dist/wxGTK/samples/dde
-cp Makefile ~/wxgtk_dist/wxGTK/samples/dde
-cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde
-cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde
-cp *.h ~/wxgtk_dist/wxGTK/samples/dde
-cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde
-cd ..
+#echo DDE sample..
+#
+#cd dde
+#mkdir ~/wxgtk_dist/wxGTK/samples/dde
+#cp Makefile ~/wxgtk_dist/wxGTK/samples/dde
+#cp Makefile.in ~/wxgtk_dist/wxGTK/samples/dde
+#cp *.cpp ~/wxgtk_dist/wxGTK/samples/dde
+#cp *.h ~/wxgtk_dist/wxGTK/samples/dde
+#cp *.xpm ~/wxgtk_dist/wxGTK/samples/dde
+#cd ..

 
 echo Dialogs sample..
 
 
 echo Dialogs sample..
 

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index ab707deb85c3730e28f39ad70a9560d67c567426..ca749bbb3f773ee336818b2fb15ac7e7ee2acdca 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -1,7 +1,7 @@
 
 

-  Welcome to wxWindows/Gtk 2.01 (beta 5),
+  Welcome to wxWindows/Gtk 2.0.1,

 
 

-you have downloaded version 2.01 of the GTK+ 1.0 port of 
+you have downloaded version 2.0.1 of the GTK+ 1.0 port of 

 the wxWindows GUI library.
  
 More information is available from my homepage at:
 the wxWindows GUI library.
  
 More information is available from my homepage at:

diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp
index 45b1eb74a9160ecc9c0c822d919ba2b8dcf31187..e973cfdedbbbe6c48a436f63986048e5ababe7b0 100644 (file)
--- a/src/common/tbarsmpl.cpp
+++ b/src/common/tbarsmpl.cpp
@@ -319,7 +319,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 
 void wxToolBarSimple::ToggleTool(int index, bool toggle)
 {
 
 void wxToolBarSimple::ToggleTool(int index, bool toggle)
 {

-  wxNode *node = m_tools.Find((long)index);
+  wxNode *node = (wxNode*) NULL;
+  node = m_tools.Find((long)index);

   if (node)
   {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
   if (node)
   {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();


@@ -344,7 +345,8 @@ void wxToolBarSimple::ToggleTool(int index, bool toggle)
 //
 void wxToolBarSimple::SpringUpButton(int index)
 {
 //
 void wxToolBarSimple::SpringUpButton(int index)
 {

-  wxNode *node=m_tools.Find((long)index);
+  wxNode *node = (wxNode*) NULL;
+  node=m_tools.Find((long)index);

   if (node) {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     if (tool && !tool->m_isToggle && tool->m_toggleState){
   if (node) {
     wxToolBarTool *tool = (wxToolBarTool *)node->Data();
     if (tool && !tool->m_isToggle && tool->m_toggleState){

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 08a4da1d1956fc0c097177709d6f533452f6afdd..a9a4e9a7d33c859d4f67fc9a912c2b4bd1e008b0 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -50,7 +50,7 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
     else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 

-    int value = (int)(win->m_adjust->value+0.5);
+    int value = (int)ceil(win->m_adjust->value);

       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;


@@ -157,12 +157,12 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
 int wxSlider::GetMin(void) const
 {
 
 int wxSlider::GetMin(void) const
 {

-    return (int)(m_adjust->lower+0.5);
+    return (int)ceil(m_adjust->lower);

 }
 
 int wxSlider::GetMax(void) const
 {
 }
 
 int wxSlider::GetMax(void) const
 {

-    return (int)(m_adjust->upper+0.5);
+    return (int)ceil(m_adjust->upper);

 }
 
 void wxSlider::SetPageSize( int pageSize )
 }
 
 void wxSlider::SetPageSize( int pageSize )


@@ -178,7 +178,7 @@ void wxSlider::SetPageSize( int pageSize )
 
 int wxSlider::GetPageSize(void) const
 {
 
 int wxSlider::GetPageSize(void) const
 {

-    return (int)(m_adjust->page_increment+0.5);
+    return (int)ceil(m_adjust->page_increment);

 }
 
 void wxSlider::SetThumbLength( int len )
 }
 
 void wxSlider::SetThumbLength( int len )


@@ -194,7 +194,7 @@ void wxSlider::SetThumbLength( int len )
 
 int wxSlider::GetThumbLength(void) const
 {
 
 int wxSlider::GetThumbLength(void) const
 {

-    return (int)(m_adjust->page_size+0.5);
+    return (int)ceil(m_adjust->page_size);

 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )

diff --git a/src/gtk1/slider.cpp b/src/gtk1/slider.cpp
index 08a4da1d1956fc0c097177709d6f533452f6afdd..a9a4e9a7d33c859d4f67fc9a912c2b4bd1e008b0 100644 (file)
--- a/src/gtk1/slider.cpp
+++ b/src/gtk1/slider.cpp
@@ -50,7 +50,7 @@ static void gtk_slider_callback( GtkWidget *WXUNUSED(widget), wxSlider *win )
     else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 
     else if (fabs(diff+page_step) < 0.2) command = wxEVT_SCROLL_PAGEUP;
     else command = wxEVT_SCROLL_THUMBTRACK;
 

-    int value = (int)(win->m_adjust->value+0.5);
+    int value = (int)ceil(win->m_adjust->value);

       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;
       
     int orient = wxHORIZONTAL;
     if (win->GetWindowStyleFlag() & wxSB_VERTICAL == wxSB_VERTICAL) orient = wxVERTICAL;


@@ -157,12 +157,12 @@ void wxSlider::SetRange( int minValue, int maxValue )
 
 int wxSlider::GetMin(void) const
 {
 
 int wxSlider::GetMin(void) const
 {

-    return (int)(m_adjust->lower+0.5);
+    return (int)ceil(m_adjust->lower);

 }
 
 int wxSlider::GetMax(void) const
 {
 }
 
 int wxSlider::GetMax(void) const
 {

-    return (int)(m_adjust->upper+0.5);
+    return (int)ceil(m_adjust->upper);

 }
 
 void wxSlider::SetPageSize( int pageSize )
 }
 
 void wxSlider::SetPageSize( int pageSize )


@@ -178,7 +178,7 @@ void wxSlider::SetPageSize( int pageSize )
 
 int wxSlider::GetPageSize(void) const
 {
 
 int wxSlider::GetPageSize(void) const
 {

-    return (int)(m_adjust->page_increment+0.5);
+    return (int)ceil(m_adjust->page_increment);

 }
 
 void wxSlider::SetThumbLength( int len )
 }
 
 void wxSlider::SetThumbLength( int len )


@@ -194,7 +194,7 @@ void wxSlider::SetThumbLength( int len )
 
 int wxSlider::GetThumbLength(void) const
 {
 
 int wxSlider::GetThumbLength(void) const
 {

-    return (int)(m_adjust->page_size+0.5);
+    return (int)ceil(m_adjust->page_size);

 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )
 }
 
 void wxSlider::SetLineSize( int WXUNUSED(lineSize) )

diff --git a/wx-config.in b/wx-config.in
index 5d3313d39465c72b09dbb0c5c98bc778ab5b2409..19ec9ce98f10c39f247a25fec143c69384dc0c33 100755 (executable)
--- a/wx-config.in
+++ b/wx-config.in
@@ -36,7 +36,7 @@ while test $# -gt 0; do
       echo $exec_prefix
       ;;
     --version)
       echo $exec_prefix
       ;;
     --version)

-      echo 2.01
+      echo 2.0.1

       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then
       ;;
     --cflags)
       if test @includedir@ != /usr/include ; then

diff --git a/wxGTK.spec b/wxGTK.spec
index b518cac93d5e511f929210435cfb05635ae18092..a0590f982200451a97cf520877371d0c85240cc3 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -1,10 +1,10 @@
 Summary: The GTK+ 1.0 port of wxWindows library
 Name: wxGTK
 Summary: The GTK+ 1.0 port of wxWindows library
 Name: wxGTK

-Version: 1.99.5
+Version: 2.0.1

 Release: 1
 Copyright: wxWindows Licence
 Group: X11/Libraries
 Release: 1
 Copyright: wxWindows Licence
 Group: X11/Libraries

-Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK2b5.tgz
+Source: ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/wxGTK201.tgz

 URL: http://www.freiburg.linux.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.0.4
 URL: http://www.freiburg.linux.de/~wxxt/docs.html
 Packager: Robert Roebling <roebling@ruf.uni-freiburg.de>
 Requires: gtk+ >= 1.0.4