projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made data variable used in inline function non-static to avoid compiler warning.
[wxWidgets.git]
/
include
/
wx
/
msw
/
spinbutt.h
diff --git
a/include/wx/msw/spinbutt.h
b/include/wx/msw/spinbutt.h
index afacb7ea8f43e0c3bb7ae4b8e9b874e76861c435..0336eb411bc827c5c428a593bf0c7db2f47dab2d 100644
(file)
--- a/
include/wx/msw/spinbutt.h
+++ b/
include/wx/msw/spinbutt.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: spinbutt.h
+// Name:
wx/univ/
spinbutt.h
// Purpose: wxSpinButton class
// Author: Julian Smart
// Modified by:
// Purpose: wxSpinButton class
// Author: Julian Smart
// Modified by:
@@
-12,32
+12,27
@@
#ifndef _WX_SPINBUTT_H_
#define _WX_SPINBUTT_H_
#ifndef _WX_SPINBUTT_H_
#define _WX_SPINBUTT_H_
-#if
def __GNUG__
-#pragma interface "spinbutt.h"
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+
#pragma interface "spinbutt.h"
#endif
#include "wx/control.h"
#include "wx/event.h"
#endif
#include "wx/control.h"
#include "wx/event.h"
-#if defined(__WIN95__)
-
+#if wxUSE_SPINBTN
class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
{
class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
{
-DECLARE_DYNAMIC_CLASS(wxSpinButton)
-
public:
public:
- /*
- * Public interface
- */
+ // construction
wxSpinButton() { }
wxSpinButton(wxWindow *parent,
wxSpinButton() { }
wxSpinButton(wxWindow *parent,
- wxWindowID id =
-1
,
+ wxWindowID id =
wxID_ANY
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
- const wxString& name =
"wxSpinButton"
)
+ const wxString& name =
wxSPIN_BUTTON_NAME
)
{
Create(parent, id, pos, size, style, name);
}
{
Create(parent, id, pos, size, style, name);
}
@@
-45,27
+40,34
@@
public:
virtual ~wxSpinButton();
bool Create(wxWindow *parent,
virtual ~wxSpinButton();
bool Create(wxWindow *parent,
- wxWindowID id =
-1
,
+ wxWindowID id =
wxID_ANY
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
- const wxString& name = "wxSpinButton");
-
+ const wxString& name = wxSPIN_BUTTON_NAME);
- // Attributes
- ////////////////////////////////////////////////////////////////////////////
+ // accessors
virtual int GetValue() const;
virtual void SetValue(int val);
virtual void SetRange(int minVal, int maxVal);
virtual int GetValue() const;
virtual void SetValue(int val);
virtual void SetRange(int minVal, int maxVal);
- //
IMPLEMENTATION
+ //
implementation
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual bool MSWCommand(WXUINT param, WXWORD id);
+ virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control);
virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control);
+
+ // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
+ virtual bool AcceptsFocus() const { return false; }
+
+protected:
+ virtual wxSize DoGetBestSize() const;
+
+private:
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
};
};
-#endif
- // _WX_WIN95__
-#endif
- // _WX_SPINBUTT_H_
+#endif // wxUSE_SPINBTN
+
+#endif // _WX_SPINBUTT_H_