projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplified gradient code a bit
[wxWidgets.git]
/
include
/
wx
/
msw
/
slider95.h
diff --git
a/include/wx/msw/slider95.h
b/include/wx/msw/slider95.h
index fbe92a43df7605c6fad10edba6b931135ca6ae54..a1891f8d89f886adb63247f3140e1e938603d90b 100644
(file)
--- a/
include/wx/msw/slider95.h
+++ b/
include/wx/msw/slider95.h
@@
-12,10
+12,6
@@
#ifndef _WX_SLIDER95_H_
#define _WX_SLIDER95_H_
#ifndef _WX_SLIDER95_H_
#define _WX_SLIDER95_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "slider95.h"
-#endif
-
class WXDLLEXPORT wxSubwindows;
// Slider
class WXDLLEXPORT wxSubwindows;
// Slider
@@
-96,6
+92,8
@@
public:
virtual bool Enable(bool show = true);
virtual bool SetFont(const wxFont& font);
virtual bool Enable(bool show = true);
virtual bool SetFont(const wxFont& font);
+ virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-118,8
+116,6
@@
protected:
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
- virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
-
// the labels windows, if any
wxSubwindows *m_labels;
// the labels windows, if any
wxSubwindows *m_labels;