adding measuring contexts, streamlining printing code

[wxWidgets.git] / include / wx / gtk / spinctrl.h

diff --git a/include/wx/gtk/spinctrl.h b/include/wx/gtk/spinctrl.h
index 14065fb96a2c0ea87ed1b95702974aa90ecb5ac6..898f1dcd1e1f6500326f632a284e3ae1ec68205f 100644 (file)
--- a/include/wx/gtk/spinctrl.h
+++ b/include/wx/gtk/spinctrl.h
@@ -8,27 +8,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKSPINCTRLH__
-#define __GTKSPINCTRLH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_SPINCTRL
-
-#include "wx/control.h"
+#ifndef _WX_GTK_SPINCTRL_H_
+#define _WX_GTK_SPINCTRL_H_

 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxSpinCtrl
 //-----------------------------------------------------------------------------
 

-class wxSpinCtrl : public wxControl
+class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl

 {
 public:
 {
 public:

-    wxSpinCtrl() {}
+    wxSpinCtrl();

     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
                const wxString& value = wxEmptyString,
     wxSpinCtrl(wxWindow *parent,
                wxWindowID id = -1,
                const wxString& value = wxEmptyString,


@@ -51,6 +41,7 @@ public:
                 const wxString& name = _T("wxSpinCtrl"));
 
     void SetValue(const wxString& text);
                 const wxString& name = _T("wxSpinCtrl"));
 
     void SetValue(const wxString& text);

+    void SetSelection(long from, long to);

 
     virtual int GetValue() const;
     virtual void SetValue( int value );
 
     virtual int GetValue() const;
     virtual void SetValue( int value );


@@ -58,29 +49,28 @@ public:
     virtual int GetMin() const;
     virtual int GetMax() const;
 
     virtual int GetMin() const;
     virtual int GetMax() const;
 

-    // implementation
-    // --------------
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

     
     

+    // implementation

     void OnChar( wxKeyEvent &event );
     
     void OnChar( wxKeyEvent &event );
     

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void ApplyWidgetStyle();

     void GtkDisableEvents();
     void GtkEnableEvents();
 
     void GtkDisableEvents();
     void GtkEnableEvents();
 

-    GtkAdjustment  *m_adjust;
-    float           m_oldPos;
+    int m_pos;

 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+
+    // Widgets that use the style->base colour for the BG colour should
+    // override this and return true.
+    virtual bool UseGTKStyleBase() const { return true; }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-    // wxUSE_SPINCTRL
-
-#endif
-    // __GTKSPINCTRLH__
+#endif // _WX_GTK_SPINCTRL_H_