projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings in EventsSuppressor ctor from gcc with -O option
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
spinctrl.h
diff --git
a/include/wx/gtk1/spinctrl.h
b/include/wx/gtk1/spinctrl.h
index 14065fb96a2c0ea87ed1b95702974aa90ecb5ac6..3237b1eeeea6cc2687160c1e5ea040886396e7a7 100644
(file)
--- a/
include/wx/gtk1/spinctrl.h
+++ b/
include/wx/gtk1/spinctrl.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: spinctrl.h
+// Name:
wx/gtk1/
spinctrl.h
// Purpose: wxSpinCtrl class
// Author: Robert Roebling
// Modified by:
// Purpose: wxSpinCtrl class
// Author: Robert Roebling
// Modified by:
@@
-11,10
+11,6
@@
#ifndef __GTKSPINCTRLH__
#define __GTKSPINCTRLH__
#ifndef __GTKSPINCTRLH__
#define __GTKSPINCTRLH__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
#include "wx/defs.h"
#if wxUSE_SPINCTRL
#include "wx/defs.h"
#if wxUSE_SPINCTRL
@@
-25,7
+21,7
@@
// wxSpinCtrl
//-----------------------------------------------------------------------------
// wxSpinCtrl
//-----------------------------------------------------------------------------
-class wxSpinCtrl : public wxControl
+class
WXDLLIMPEXP_CORE
wxSpinCtrl : public wxControl
{
public:
wxSpinCtrl() {}
{
public:
wxSpinCtrl() {}
@@
-51,6
+47,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,13
+55,13
@@
public:
virtual int GetMin() const;
virtual int GetMax() const;
virtual int GetMin() const;
virtual int GetMax() const;
+ static wxVisualAttributes
+ GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
// implementation
// implementation
- // --------------
-
void OnChar( wxKeyEvent &event );
void OnChar( wxKeyEvent &event );
-
+
bool IsOwnGtkWindow( GdkWindow *window );
bool IsOwnGtkWindow( GdkWindow *window );
- void ApplyWidgetStyle();
void GtkDisableEvents();
void GtkEnableEvents();
void GtkDisableEvents();
void GtkEnableEvents();
@@
-74,6
+71,10
@@
public:
protected:
virtual wxSize DoGetBestSize() const;
protected:
virtual wxSize DoGetBestSize() 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()