added SpinCtrl,

updated a few headers,
  tried to set window size hints, no effect with KWM,


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

src/gtk1/dialog.cpp

@@ -38,33 +38,6 @@ extern bool g_isIdle;
 
 extern wxList wxPendingDelete;
 
-/*
-//-----------------------------------------------------------------------------
-// instruct X to set the WM hint for positioning
-//-----------------------------------------------------------------------------
-
-extern "C" {
-
-static void gdk_window_set_position_hint( GdkWindow *window, gint x, gint y )
-{
-  GdkWindowPrivate *priv;
-  XSizeHints size_hints;
-  
-  g_return_if_fail (window != NULL);
-  
-  priv = (GdkWindowPrivate*) window;
-  if (priv->destroyed) return;
-  
-  size_hints.flags = PPosition;
-  size_hints.x = x;
-  size_hints.y = y;
-   
-  XSetWMNormalHints (priv->xdisplay, priv->xwindow, &size_hints);
-}
-
-}
-*/
-
 //-----------------------------------------------------------------------------
 // "delete_event"
 //-----------------------------------------------------------------------------
@@ -150,9 +123,18 @@ gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
        position in "realize" and "map" */
     gtk_widget_set_uposition( widget, win->m_x, win->m_y );
 
-/*
-    gdk_window_set_position_hint( widget->window, win->m_x, win->m_y );
-*/
+    /* set size hints */
+    gint flag =	GDK_HINT_POS;
+    if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
+    if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
+    if (flag)
+    {
+        gdk_window_set_hints( win->m_widget->window, 
+	                      win->m_x, win->m_y,
+			      win->GetMinWidth(), win->GetMinHeight(),
+			      win->GetMaxWidth(), win->GetMaxHeight(),
+			      flag );
+    }
 
     /* reset the icon */
     if (win->m_icon != wxNullIcon)

src/gtk1/frame.cpp

@@ -233,6 +233,19 @@ gtk_frame_realized_callback( GtkWidget *WXUNUSED(widget), wxFrame *win )
     else
         gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
 
+    /* set size hints */
+    gint flag =	GDK_HINT_POS;
+    if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
+    if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
+    if (flag)
+    {
+        gdk_window_set_hints( win->m_widget->window, 
+	                      win->m_x, win->m_y,
+			      win->GetMinWidth(), win->GetMinHeight(),
+			      win->GetMaxWidth(), win->GetMaxHeight(),
+			      flag );
+    }
+    
     /* reset the icon */
     if (win->m_icon != wxNullIcon)
     {

src/gtk1/spinbutt.cpp

@@ -35,7 +35,7 @@ extern bool g_isIdle;
 
 extern bool   g_blockEventsOnDrag;
 
-static const float sensitivity = 0.2;
+static const float sensitivity = 0.02;
 
 //-----------------------------------------------------------------------------
 // "value_changed"
@@ -101,7 +101,7 @@ bool wxSpinButton::Create(wxWindow *parent,
     wxSize new_size = size;
     new_size.x = 15;
     if (new_size.y == -1)
-        new_size.y = 30;
+        new_size.y = 26;
 
     if (!PreCreation( parent, pos, new_size ) ||
         !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
@@ -134,10 +134,6 @@ bool wxSpinButton::Create(wxWindow *parent,
     return TRUE;
 }
 
-wxSpinButton::~wxSpinButton()
-{
-}
-
 int wxSpinButton::GetMin() const
 {
     wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );

src/gtk1/spinctrl.cpp

@@ -0,0 +1,199 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        spinbutt.cpp
+// Purpose:     wxSpinCtrl
+// Author:      Robert
+// Modified by:
+// RCS-ID:      $Id$
+// Copyright:   (c) Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifdef __GNUG__
+#pragma implementation "spinctrl.h"
+#endif
+
+#include "wx/spinctrl.h"
+
+#ifdef wxUSE_SPINBTN
+
+#include "wx/utils.h"
+#include "wx/spinbutt.h"
+#include <math.h>
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
+static const float sensitivity = 0.02;
+
+//-----------------------------------------------------------------------------
+// "value_changed"
+//-----------------------------------------------------------------------------
+
+static void gtk_spinctrl_callback( GtkWidget *WXUNUSED(widget), wxSpinCtrl *win )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (!win->m_hasVMT) return;
+    if (g_blockEventsOnDrag) return;
+
+    float diff = win->m_adjust->value - win->m_oldPos;
+    if (fabs(diff) < sensitivity) return;
+    win->m_oldPos = win->m_adjust->value;
+
+    wxEventType command = wxEVT_NULL;
+
+    float line_step = win->m_adjust->step_increment;
+
+    if (fabs(diff-line_step) < sensitivity) command = wxEVT_SCROLL_LINEDOWN;
+    else if (fabs(diff+line_step) < sensitivity) command = wxEVT_SCROLL_LINEUP;
+    else command = wxEVT_SCROLL_THUMBTRACK;
+
+    int value = (int)ceil(win->m_adjust->value);
+
+    wxSpinEvent event( command, win->GetId());
+    event.SetPosition( value );
+    event.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( event );
+    
+    /* always send a thumbtrack event */
+    if (command != wxEVT_SCROLL_THUMBTRACK)
+    {
+        command = wxEVT_SCROLL_THUMBTRACK;
+        wxSpinEvent event2( command, win->GetId());
+        event2.SetPosition( value );
+        event2.SetEventObject( win );
+        win->GetEventHandler()->ProcessEvent( event2 );
+    }
+}
+
+//-----------------------------------------------------------------------------
+// wxSpinCtrl
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl,wxControl)
+
+bool wxSpinCtrl::Create(wxWindow *parent, wxWindowID id,
+                          const wxPoint& pos,  const wxSize& size,
+                          long style,
+                          int min, int max, int initial,
+                          const wxString& name)
+{
+    m_needParent = TRUE;
+
+    wxSize new_size = size;
+    if (new_size.y == -1)
+        new_size.y = 26;
+
+    if (!PreCreation( parent, pos, new_size ) ||
+        !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxSpinCtrl creation failed") );
+	return FALSE;
+    }
+
+    m_oldPos = initial;
+
+    m_adjust = (GtkAdjustment*) gtk_adjustment_new( initial, min, max, 1.0, 5.0, 0.0);
+
+    m_widget = gtk_spin_button_new( m_adjust, 1, 0 );
+
+    gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
+
+    gtk_signal_connect( GTK_OBJECT (m_adjust),
+                        "value_changed",
+                        (GtkSignalFunc) gtk_spinctrl_callback,
+                        (gpointer) this );
+
+    m_parent->DoAddChild( this );
+
+    PostCreation();
+
+    SetBackgroundColour( parent->GetBackgroundColour() );
+
+    Show( TRUE );
+
+    return TRUE;
+}
+
+int wxSpinCtrl::GetMin() const
+{
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    return (int)ceil(m_adjust->lower);
+}
+
+int wxSpinCtrl::GetMax() const
+{
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    return (int)ceil(m_adjust->upper);
+}
+
+int wxSpinCtrl::GetValue() const
+{
+    wxCHECK_MSG( (m_widget != NULL), 0, wxT("invalid spin button") );
+
+    return (int)ceil(m_adjust->value);
+}
+
+void wxSpinCtrl::SetValue( int value )
+{
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    float fpos = (float)value;
+    m_oldPos = fpos;
+    if (fabs(fpos-m_adjust->value) < sensitivity) return;
+
+    m_adjust->value = fpos;
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
+}
+
+void wxSpinCtrl::SetRange(int minVal, int maxVal)
+{
+    wxCHECK_RET( (m_widget != NULL), wxT("invalid spin button") );
+
+    float fmin = (float)minVal;
+    float fmax = (float)maxVal;
+
+    if ((fabs(fmin-m_adjust->lower) < sensitivity) &&
+        (fabs(fmax-m_adjust->upper) < sensitivity))
+    {
+        return;
+    }
+
+    m_adjust->lower = fmin;
+    m_adjust->upper = fmax;
+
+    gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "changed" );
+    
+    // these two calls are required due to some bug in GTK
+    Refresh();
+    SetFocus();
+}
+
+bool wxSpinCtrl::IsOwnGtkWindow( GdkWindow *window )
+{
+    return GTK_SPIN_BUTTON(m_widget)->panel == window;
+}
+
+void wxSpinCtrl::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+#endif