cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get/SetTitle only for wxTopLevelWindow (wxMGL part).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-11-04 18:49:49 +00:00
parent 72c23f8e29
commit 46ae103b9f
5 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/mgl/toplevel.h
View File

@ -43,16 +43,16 @@ public:
virtual ~wxTopLevelWindowMGL();
// implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE);
virtual void Maximize(bool maximize = true);
virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = TRUE);
virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const;
virtual void Restore();
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; }
virtual bool Show(bool show = TRUE);
virtual bool Show(bool show = true);
virtual void SetTitle(const wxString &title) { m_title = title; }
virtual wxString GetTitle() const { return m_title; }

23
include/wx/mgl/window.h
View File

@ -48,10 +48,16 @@ public:
long style = 0,
const wxString& name = wxPanelNameStr);
// implement base class (pure) virtual methods
// -------------------------------------------
virtual void SetLabel( const wxString &WXUNUSED(label) ) {}
virtual wxString GetLabel() const { return wxEmptyString; }
virtual void Raise();
virtual void Lower();
virtual bool Show(bool show = TRUE);
virtual bool Show(bool show = true);
virtual void SetFocus();
@ -59,7 +65,7 @@ public:
virtual void WarpPointer(int x, int y);
virtual void Refresh(bool eraseBackground = TRUE,
virtual void Refresh(bool eraseBackground = true,
const wxRect *rect = (const wxRect *) NULL);
virtual void Update();
virtual void Clear();
@ -67,7 +73,7 @@ public:
virtual void Thaw();
virtual bool SetCursor(const wxCursor &cursor);
virtual bool SetFont(const wxFont &font) { m_font = font; return TRUE; }
virtual bool SetFont(const wxFont &font) { m_font = font; return true; }
virtual int GetCharHeight() const;
virtual int GetCharWidth() const;
@ -86,12 +92,12 @@ public:
virtual void DragAcceptFiles(bool accept);
virtual WXWidget GetHandle() const { return m_wnd; }
void SetMGLwindow_t(struct window_t *wnd);
// implementation from now on
// --------------------------
void OnInternalIdle();
protected:
@ -122,13 +128,13 @@ protected:
// ::MoveWindow() except for composite controls which will want to arrange
// themselves inside the given rectangle
virtual void DoMoveWindow(int x, int y, int width, int height);
private:
// common part of all ctors
void Init();
// counterpart to SetFocus
void KillFocus();
MGLDevCtx *m_paintMGLDC;
friend class wxPaintDC;
@ -143,5 +149,4 @@ public:
};
#endif
// _WX_WINDOW_H_
#endif // _WX_WINDOW_H_

1
include/wx/toplevel.h
View File

@ -155,6 +155,7 @@ public:
virtual bool IsFullScreen() const = 0;
#if defined(__WXMSW__) || \
defined(__WXMGL__) || \
defined(__WXMOTIF__) || \
defined(__WXGTK__)

1
include/wx/window.h
View File

@ -169,6 +169,7 @@ public:
// -----------------
#if !defined(__WXMSW__) && \
!defined(__WXMGL__) && \
!defined(__WXMOTIF__) && \
!defined(__WXGTK__)

48
src/mgl/toplevel.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: toplevel.cpp
// Name: src/mgl/toplevel.cpp
// Purpose:
// Author: Vaclav Slavik
// Id: $Id$
@ -48,11 +48,11 @@ extern int g_openDialogs;
void wxTopLevelWindowMGL::Init()
{
m_isShown = FALSE;
m_isIconized = FALSE;
m_isMaximized = FALSE;
m_fsIsShowing = FALSE;
m_sizeSet = FALSE;
m_isShown = false;
m_isIconized = false;
m_isMaximized = false;
m_fsIsShowing = false;
m_sizeSet = false;
}
bool wxTopLevelWindowMGL::Create(wxWindow *parent,
@ -66,27 +66,27 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
// always create a frame of some reasonable, even if arbitrary, size (at
// least for MSW compatibility)
wxSize size = sizeOrig;
if ( size.x == -1 || size.y == -1 )
if ( size.x == wxDefaultCoord || size.y == wxDefaultCoord )
{
wxSize sizeDefault = GetDefaultSize();
if ( size.x == -1 )
if ( size.x == wxDefaultCoord )
size.x = sizeDefault.x;
if ( size.y == -1 )
if ( size.y == wxDefaultCoord )
size.y = sizeDefault.y;
}
// for default positioning, centre the first top level window and
// cascade any addtional ones from there.
wxPoint pos = posOrig;
if ( pos.x == -1 || pos.y == -1 )
if ( pos.x == wxDefaultCoord || pos.y == wxDefaultCoord )
{
wxSize sizeDisplay = wxGetDisplaySize();
static wxPoint nextPos((sizeDisplay.x - size.x) / 2,
(sizeDisplay.y - size.y) / 2);
if ( pos.x == -1 )
if ( pos.x == wxDefaultCoord )
pos.x = nextPos.x;
if ( pos.y == -1 )
if ( pos.y == wxDefaultCoord )
pos.y = nextPos.y;
if ( pos.x + size.x > sizeDisplay.x || pos.y + size.y > sizeDisplay.y )
pos = wxPoint();
@ -103,12 +103,12 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
wxTopLevelWindows.Append(this);
m_title = title;
return TRUE;
return true;
}
wxTopLevelWindowMGL::~wxTopLevelWindowMGL()
{
m_isBeingDeleted = TRUE;
m_isBeingDeleted = true;
wxTopLevelWindows.DeleteObject(this);
@ -124,7 +124,7 @@ wxTopLevelWindowMGL::~wxTopLevelWindowMGL()
bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
{
if (show == m_fsIsShowing) return FALSE; // return what?
if (show == m_fsIsShowing) return false; // return what?
m_fsIsShowing = show;
@ -147,11 +147,11 @@ bool wxTopLevelWindowMGL::ShowFullScreen(bool show, long style)
else
{
m_windowStyle = m_fsSaveStyle;
SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
SetSize(m_fsSaveFrame.x, m_fsSaveFrame.y,
m_fsSaveFrame.width, m_fsSaveFrame.height);
}
return TRUE;
return true;
}
bool wxTopLevelWindowMGL::Show(bool show)
@ -162,7 +162,7 @@ bool wxTopLevelWindowMGL::Show(bool show)
// so that the frame can adjust itself (think auto layout or single child)
if ( !m_sizeSet )
{
m_sizeSet = TRUE;
m_sizeSet = true;
wxSizeEvent event(GetSize(), GetId());
event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event);
@ -184,7 +184,7 @@ void wxTopLevelWindowMGL::Maximize(bool maximize)
if ( maximize && !m_isMaximized )
{
m_isMaximized = TRUE;
m_isMaximized = true;
GetPosition(&m_savedFrame.x, &m_savedFrame.y);
GetSize(&m_savedFrame.width, &m_savedFrame.height);
@ -193,8 +193,8 @@ void wxTopLevelWindowMGL::Maximize(bool maximize)
}
else if ( !maximize && m_isMaximized )
{
m_isMaximized = FALSE;
SetSize(m_savedFrame.x, m_savedFrame.y,
m_isMaximized = false;
SetSize(m_savedFrame.x, m_savedFrame.y,
m_savedFrame.width, m_savedFrame.height);
}
}
@ -208,11 +208,11 @@ void wxTopLevelWindowMGL::Restore()
{
if ( IsIconized() )
{
Iconize(FALSE);
Iconize(false);
}
if ( IsMaximized() )
{
Maximize(FALSE);
Maximize(false);
}
}