projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow loading wxAnimationCtrl contents from stream (patch 1962344)
[wxWidgets.git]
/
include
/
wx
/
window.h
diff --git
a/include/wx/window.h
b/include/wx/window.h
index 33d33ce50d8e3690bb7344ecbbae5ae3e9c9ef57..ae6b8d16619a33f27ab8e0b3063a78ea2e60117b 100644
(file)
--- a/
include/wx/window.h
+++ b/
include/wx/window.h
@@
-87,7
+87,7
@@
class WXDLLIMPEXP_FWD_CORE wxAccessible;
// ----------------------------------------------------------------------------
// struct containing all the visual attributes of a control
// ----------------------------------------------------------------------------
// struct containing all the visual attributes of a control
-struct WXDLL
EXPORT
wxVisualAttributes
+struct WXDLL
IMPEXP_CORE
wxVisualAttributes
{
// the font used for control label/text inside it
wxFont font;
{
// the font used for control label/text inside it
wxFont font;
@@
-118,8
+118,14
@@
enum wxWindowVariant
// valid values for Show/HideWithEffect()
enum wxShowEffect
{
// valid values for Show/HideWithEffect()
enum wxShowEffect
{
- wxSHOW_EFFECT_ROLL,
- wxSHOW_EFFECT_SLIDE,
+ wxSHOW_EFFECT_ROLL_TO_LEFT,
+ wxSHOW_EFFECT_ROLL_TO_RIGHT,
+ wxSHOW_EFFECT_ROLL_TO_TOP,
+ wxSHOW_EFFECT_ROLL_TO_BOTTOM,
+ wxSHOW_EFFECT_SLIDE_TO_LEFT,
+ wxSHOW_EFFECT_SLIDE_TO_RIGHT,
+ wxSHOW_EFFECT_SLIDE_TO_TOP,
+ wxSHOW_EFFECT_SLIDE_TO_BOTTOM,
wxSHOW_EFFECT_BLEND,
wxSHOW_EFFECT_EXPAND,
wxSHOW_EFFECT_MAX
wxSHOW_EFFECT_BLEND,
wxSHOW_EFFECT_EXPAND,
wxSHOW_EFFECT_MAX
@@
-129,13
+135,13
@@
enum wxShowEffect
// (pseudo)template list classes
// ----------------------------------------------------------------------------
// (pseudo)template list classes
// ----------------------------------------------------------------------------
-WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLL
EXPORT
);
+WX_DECLARE_LIST_3(wxWindow, wxWindowBase, wxWindowList, wxWindowListNode, class WXDLL
IMPEXP_CORE
);
// ----------------------------------------------------------------------------
// global variables
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// global variables
// ----------------------------------------------------------------------------
-extern WXDLL
EXPORT_DATA
(wxWindowList) wxTopLevelWindows;
+extern WXDLL
IMPEXP_DATA_CORE
(wxWindowList) wxTopLevelWindows;
extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
// ----------------------------------------------------------------------------
extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
// ----------------------------------------------------------------------------
@@
-149,7
+155,7
@@
extern WXDLLIMPEXP_DATA_CORE(wxList) wxPendingDelete;
// temporarily switches event handlers).
// ----------------------------------------------------------------------------
// temporarily switches event handlers).
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxWindowBase : public wxEvtHandler
+class WXDLL
IMPEXP_CORE
wxWindowBase : public wxEvtHandler
{
public:
// creating the window
{
public:
// creating the window
@@
-517,10
+523,10
@@
public:
virtual wxSize GetWindowBorderSize() const;
// wxSizer and friends use this to give a chance to a component to recalc
virtual wxSize GetWindowBorderSize() const;
// wxSizer and friends use this to give a chance to a component to recalc
- // its min size once one of the final size components is known. Override
- // this function when that is useful (such as for wxStaticText which can
+ // its min size once one of the final size components is known. Override
+ // this function when that is useful (such as for wxStaticText which can
// stretch over several lines). Parameter availableOtherDir
// stretch over several lines). Parameter availableOtherDir
- // tells the item how much more space there is available in the opposite
+ // tells the item how much more space there is available in the opposite
// direction (-1 if unknown).
virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
{ return false; }
// direction (-1 if unknown).
virtual bool InformFirstDirection( int WXUNUSED(direction), int WXUNUSED(size), int WXUNUSED(availableOtherDir) )
{ return false; }
@@
-538,27
+544,15
@@
public:
//
// timeout specifies how long the animation should take, in ms, the
// default value of 0 means to use the default (system-dependent) value
//
// timeout specifies how long the animation should take, in ms, the
// default value of 0 means to use the default (system-dependent) value
- //
- // direction is only used with wxSHOW_EFFECT_ROLL and SLIDE values
- virtual bool ShowWithEffect(wxShowEffect effect,
- unsigned timeout = 0,
- wxDirection dir = wxBOTTOM)
+ virtual bool ShowWithEffect(wxShowEffect WXUNUSED(effect),
+ unsigned WXUNUSED(timeout) = 0)
{
{
- wxUnusedVar(effect);
- wxUnusedVar(timeout);
- wxUnusedVar(dir);
-
return Show();
}
return Show();
}
- virtual bool HideWithEffect(wxShowEffect effect,
- unsigned timeout = 0,
- wxDirection dir = wxBOTTOM)
+ virtual bool HideWithEffect(wxShowEffect WXUNUSED(effect),
+ unsigned WXUNUSED(timeout) = 0)
{
{
- wxUnusedVar(effect);
- wxUnusedVar(timeout);
- wxUnusedVar(dir);
-
return Hide();
}
return Hide();
}
@@
-888,16
+882,10
@@
public:
virtual void ClearBackground();
// freeze the window: don't redraw it until it is thawed
virtual void ClearBackground();
// freeze the window: don't redraw it until it is thawed
- void Freeze()
{ if ( !m_freezeCount++ ) DoFreeze(); }
+ void Freeze()
;
// thaw the window: redraw it after it had been frozen
// thaw the window: redraw it after it had been frozen
- void Thaw()
- {
- wxASSERT_MSG( m_freezeCount, "Thaw() without matching Freeze()" );
-
- if ( !--m_freezeCount )
- DoThaw();
- }
+ void Thaw();
// return true if window had been frozen and not unthawed yet
bool IsFrozen() const { return m_freezeCount != 0; }
// return true if window had been frozen and not unthawed yet
bool IsFrozen() const { return m_freezeCount != 0; }
@@
-1156,9
+1144,13
@@
public:
#if wxUSE_HELP
// associate this help text with this window
void SetHelpText(const wxString& text);
#if wxUSE_HELP
// associate this help text with this window
void SetHelpText(const wxString& text);
- // associate this help text with all windows with the same id as this
- // one
- void SetHelpTextForId(const wxString& text);
+
+#if WXWIN_COMPATIBILITY_2_8
+ // Associate this help text with all windows with the same id as this one.
+ // Don't use this, do wxHelpProvider::Get()->AddHelp(id, text);
+ wxDEPRECATED( void SetHelpTextForId(const wxString& text) );
+#endif // WXWIN_COMPATIBILITY_2_8
+
// get the help string associated with the given position in this window
//
// notice that pt may be invalid if event origin is keyboard or unknown
// get the help string associated with the given position in this window
//
// notice that pt may be invalid if event origin is keyboard or unknown
@@
-1760,16
+1752,16
@@
inline wxWindow *wxWindowBase::GetGrandParent() const
// Find the wxWindow at the current mouse position, also returning the mouse
// position.
// Find the wxWindow at the current mouse position, also returning the mouse
// position.
-extern WXDLL
EXPORT
wxWindow* wxFindWindowAtPointer(wxPoint& pt);
+extern WXDLL
IMPEXP_CORE
wxWindow* wxFindWindowAtPointer(wxPoint& pt);
// Get the current mouse position.
// Get the current mouse position.
-extern WXDLL
EXPORT
wxPoint wxGetMousePosition();
+extern WXDLL
IMPEXP_CORE
wxPoint wxGetMousePosition();
// get the currently active window of this application or NULL
// get the currently active window of this application or NULL
-extern WXDLL
EXPORT
wxWindow *wxGetActiveWindow();
+extern WXDLL
IMPEXP_CORE
wxWindow *wxGetActiveWindow();
// get the (first) top level parent window
// get the (first) top level parent window
-WXDLL
EXPORT
wxWindow* wxGetTopLevelParent(wxWindow *win);
+WXDLL
IMPEXP_CORE
wxWindow* wxGetTopLevelParent(wxWindow *win);
#if WXWIN_COMPATIBILITY_2_6
// deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
#if WXWIN_COMPATIBILITY_2_6
// deprecated (doesn't start with 'wx' prefix), use wxWindow::NewControlId()
@@
-1782,7
+1774,7
@@
WXDLLEXPORT wxWindow* wxGetTopLevelParent(wxWindow *win);
// accessible object for windows
// ----------------------------------------------------------------------------
// accessible object for windows
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxWindowAccessible: public wxAccessible
+class WXDLL
IMPEXP_CORE
wxWindowAccessible: public wxAccessible
{
public:
wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); }
{
public:
wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); }