projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added C/wxString array constructors to wxArrayString
[wxWidgets.git]
/
include
/
wx
/
msw
/
spinbutt.h
diff --git
a/include/wx/msw/spinbutt.h
b/include/wx/msw/spinbutt.h
index 721ae2017af0e8d835edb10f57b48a47f18fde37..0336eb411bc827c5c428a593bf0c7db2f47dab2d 100644
(file)
--- a/
include/wx/msw/spinbutt.h
+++ b/
include/wx/msw/spinbutt.h
@@
-12,13
+12,15
@@
#ifndef _WX_SPINBUTT_H_
#define _WX_SPINBUTT_H_
#ifndef _WX_SPINBUTT_H_
#define _WX_SPINBUTT_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "spinbutt.h"
#endif
#include "wx/control.h"
#include "wx/event.h"
#pragma interface "spinbutt.h"
#endif
#include "wx/control.h"
#include "wx/event.h"
+#if wxUSE_SPINBTN
+
class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
{
public:
class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
{
public:
@@
-26,7
+28,7
@@
public:
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,
@@
-38,7
+40,7
@@
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,
@@
-57,7
+59,7
@@
public:
WXWORD pos, WXHWND control);
// a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
WXWORD pos, WXHWND control);
// a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
- virtual bool AcceptsFocus() const { return
FALSE
; }
+ virtual bool AcceptsFocus() const { return
false
; }
protected:
virtual wxSize DoGetBestSize() const;
protected:
virtual wxSize DoGetBestSize() const;
@@
-66,5
+68,6
@@
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxSpinButton)
};
-#endif
- // _WX_SPINBUTT_H_
+#endif // wxUSE_SPINBTN
+
+#endif // _WX_SPINBUTT_H_