projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document that wxDC::FloodFill() is not implemented under wxOSX.
[wxWidgets.git]
/
include
/
wx
/
scrolbar.h
diff --git
a/include/wx/scrolbar.h
b/include/wx/scrolbar.h
index 2c39fb25596e845428e5f0f8c949c174826f5408..f63573c0cb6c6ca2bfe4786d8f4a8314cfebe97e 100644
(file)
--- a/
include/wx/scrolbar.h
+++ b/
include/wx/scrolbar.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: scrolbar.h
+// Name:
wx/
scrolbar.h
// Purpose: wxScrollBar base header
// Author: Julian Smart
// Modified by:
// Purpose: wxScrollBar base header
// Author: Julian Smart
// Modified by:
@@
-18,18
+18,21
@@
#include "wx/control.h"
#include "wx/control.h"
-extern WXDLL
EXPORT_DATA(const wxC
har) wxScrollBarNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxScrollBarNameStr[];
// ----------------------------------------------------------------------------
// wxScrollBar: a scroll bar control
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxScrollBar: a scroll bar control
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxScrollBarBase : public wxControl
+class WXDLL
IMPEXP_CORE
wxScrollBarBase : public wxControl
{
public:
wxScrollBarBase() { }
{
public:
wxScrollBarBase() { }
- // scrollbar construction
+ /*
+ Derived classes should provide the following method and ctor with the
+ same parameters:
+
bool Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
bool Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@
-37,6
+40,7
@@
public:
long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr);
long style = wxSB_HORIZONTAL,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxScrollBarNameStr);
+ */
// accessors
virtual int GetThumbPosition() const = 0;
// accessors
virtual int GetThumbPosition() const = 0;
@@
-52,8
+56,11
@@
public:
int range, int pageSize,
bool refresh = true) = 0;
int range, int pageSize,
bool refresh = true) = 0;
+ // implementation-only
+ bool IsNeeded() const { return GetRange() > GetThumbSize(); }
+
private:
private:
- DECLARE_NO_COPY_CLASS(wxScrollBarBase)
+ wxDECLARE_NO_COPY_CLASS(wxScrollBarBase);
};
#if defined(__WXUNIVERSAL__)
};
#if defined(__WXUNIVERSAL__)
@@
-62,10
+69,12
@@
private:
#include "wx/msw/scrolbar.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/scrolbar.h"
#include "wx/msw/scrolbar.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/scrolbar.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK
20
__)
#include "wx/gtk/scrolbar.h"
#include "wx/gtk/scrolbar.h"
+#elif defined(__WXGTK__)
+ #include "wx/gtk1/scrolbar.h"
#elif defined(__WXMAC__)
#elif defined(__WXMAC__)
- #include "wx/
mac
/scrolbar.h"
+ #include "wx/
osx
/scrolbar.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/scrolbar.h"
#elif defined(__WXPM__)
#elif defined(__WXCOCOA__)
#include "wx/cocoa/scrolbar.h"
#elif defined(__WXPM__)