projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix wxYield[IfNeeded] dll linkage (closes #10325)
[wxWidgets.git]
/
include
/
wx
/
toplevel.h
diff --git
a/include/wx/toplevel.h
b/include/wx/toplevel.h
index c737099e2f5cf844bc9978cae8cb4c88fbb55aa4..2421a6eb23fe10aea28ce63d2541a943d5828ac8 100644
(file)
--- a/
include/wx/toplevel.h
+++ b/
include/wx/toplevel.h
@@
-18,13
+18,15
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#include "wx/
window
.h"
+#include "wx/
nonownedwnd
.h"
#include "wx/iconbndl.h"
#include "wx/iconbndl.h"
+#include "wx/containr.h"
+#include "wx/weakref.h"
// the default names for various classes
// the default names for various classes
-extern WXDLL
EXPORT_DATA(const wxC
har) wxFrameNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxFrameNameStr[];
-class WXDLL
EXPORT
wxTopLevelWindowBase;
+class WXDLL
IMPEXP_FWD_CORE
wxTopLevelWindowBase;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-115,7
+117,7
@@
enum
// wxTopLevelWindow: a top level (as opposed to child) window
// ----------------------------------------------------------------------------
// wxTopLevelWindow: a top level (as opposed to child) window
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT wxTopLevelWindowBase : public wx
Window
+class WXDLL
IMPEXP_CORE wxTopLevelWindowBase : public wxNonOwned
Window
{
public:
// construction
{
public:
// construction
@@
-145,16
+147,16
@@
public:
virtual bool IsIconized() const = 0;
// get the frame icon
virtual bool IsIconized() const = 0;
// get the frame icon
- const wxIcon& GetIcon() const { return m_icons.GetIcon( -1 ); }
+ wxIcon GetIcon() const;
// get the frame icons
const wxIconBundle& GetIcons() const { return m_icons; }
// get the frame icons
const wxIconBundle& GetIcons() const { return m_icons; }
- // set the frame icon
- v
irtual void SetIcon(const wxIcon& icon) { m_icons = wxIconBundle( icon ); }
+ // set the frame icon
: implemented in terms of SetIcons()
+ v
oid SetIcon(const wxIcon& icon);
// set the frame icons
// set the frame icons
- virtual void SetIcons(const wxIconBundle& icons
) { m_icons = icons; }
+ virtual void SetIcons(const wxIconBundle& icons) { m_icons = icons; }
// maximize the window to cover entire screen
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0;
// maximize the window to cover entire screen
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0;
@@
-206,9
+208,6
@@
public:
// reverts to the "permanent" default as soon as this temporary default
// item loses focus
// reverts to the "permanent" default as soon as this temporary default
// item loses focus
- // used to reset default if pointing to removed child
- virtual void RemoveChild(wxWindowBase *child);
-
// get the default item, temporary or permanent
wxWindow *GetDefaultItem() const
{ return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
// get the default item, temporary or permanent
wxWindow *GetDefaultItem() const
{ return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
@@
-248,17
+247,11
@@
public:
// do the window-specific processing after processing the update event
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
// do the window-specific processing after processing the update event
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ;
-protected:
-
// a different API for SetSizeHints
virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize);
// a different API for SetSizeHints
virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize);
- // set size hints for "window manager"
- virtual void DoSetSizeHints( int minW, int minH,
- int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
- int incW = wxDefaultCoord, int incH = wxDefaultCoord );
-
+protected:
// the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area
virtual void DoClientToScreen(int *x, int *y) const;
// the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area
virtual void DoClientToScreen(int *x, int *y) const;
@@
-296,17
+289,19
@@
protected:
static int WidthDefault(int w) { return w == wxDefaultCoord ? GetDefaultSize().x : w; }
static int HeightDefault(int h) { return h == wxDefaultCoord ? GetDefaultSize().y : h; }
static int WidthDefault(int w) { return w == wxDefaultCoord ? GetDefaultSize().x : w; }
static int HeightDefault(int h) { return h == wxDefaultCoord ? GetDefaultSize().y : h; }
+
// the frame icon
wxIconBundle m_icons;
// a default window (usually a button) or NULL
// the frame icon
wxIconBundle m_icons;
// a default window (usually a button) or NULL
- wxWindow
*
m_winDefault;
+ wxWindow
Ref
m_winDefault;
// a temporary override of m_winDefault, use the latter if NULL
// a temporary override of m_winDefault, use the latter if NULL
- wxWindow
*
m_winTmpDefault;
+ wxWindow
Ref
m_winTmpDefault;
DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
DECLARE_EVENT_TABLE()
+ WX_DECLARE_CONTROL_CONTAINER();
};
};
@@
-333,7
+328,7
@@
protected:
#include "wx/dfb/toplevel.h"
#define wxTopLevelWindowNative wxTopLevelWindowDFB
#elif defined(__WXMAC__)
#include "wx/dfb/toplevel.h"
#define wxTopLevelWindowNative wxTopLevelWindowDFB
#elif defined(__WXMAC__)
- #include "wx/
mac
/toplevel.h"
+ #include "wx/
osx
/toplevel.h"
#define wxTopLevelWindowNative wxTopLevelWindowMac
#elif defined(__WXCOCOA__)
#include "wx/cocoa/toplevel.h"
#define wxTopLevelWindowNative wxTopLevelWindowMac
#elif defined(__WXCOCOA__)
#include "wx/cocoa/toplevel.h"
@@
-350,7
+345,7
@@
protected:
#include "wx/univ/toplevel.h"
#else // !__WXUNIVERSAL__
#ifdef wxTopLevelWindowNative
#include "wx/univ/toplevel.h"
#else // !__WXUNIVERSAL__
#ifdef wxTopLevelWindowNative
- class WXDLL
EXPORT
wxTopLevelWindow : public wxTopLevelWindowNative
+ class WXDLL
IMPEXP_CORE
wxTopLevelWindow : public wxTopLevelWindowNative
{
public:
// construction
{
public:
// construction