AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get/SetTitle only for wxTopLevelWindow (wxGTK part).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-11-04 11:11:22 +00:00
parent d40209bbc4
commit cb8cc2506b
8 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/gtk/mdi.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gtk/mdi.h // Name: wx/gtk/mdi.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@ -140,11 +140,11 @@ public:
// no size hints // no size hints
virtual void DoSetSizeHints( int WXUNUSED(minW), virtual void DoSetSizeHints( int WXUNUSED(minW),
int WXUNUSED(minH), int WXUNUSED(minH),
int WXUNUSED(maxW) = -1, int WXUNUSED(maxW) = wxDefaultCoord,
int WXUNUSED(maxH) = -1, int WXUNUSED(maxH) = wxDefaultCoord,
int WXUNUSED(incW) = -1, int WXUNUSED(incW) = wxDefaultCoord,
int WXUNUSED(incH) = -1) {} int WXUNUSED(incH) = wxDefaultCoord) {}
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
// no toolbar // no toolbar
@ -162,8 +162,7 @@ public:
{ wxTopLevelWindowBase::SetIcons(icons); } { wxTopLevelWindowBase::SetIcons(icons); }
// no title // no title
void SetTitle( const wxString &title ); virtual void SetTitle( const wxString &title );
wxString GetTitle() const { return m_title; }
// no maximize etc // no maximize etc
virtual void Maximize( bool WXUNUSED(maximize) = true ) { } virtual void Maximize( bool WXUNUSED(maximize) = true ) { }
@ -213,4 +212,3 @@ private:
}; };
#endif // __MDIH__ #endif // __MDIH__

9
include/wx/gtk/toplevel.h
View File

@ -43,9 +43,9 @@ public:
virtual ~wxTopLevelWindowGTK(); virtual ~wxTopLevelWindowGTK();
// implement base class pure virtuals // implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE); virtual void Maximize(bool maximize = true);
virtual bool IsMaximized() const; virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = TRUE); virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const; virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon); virtual void SetIcon(const wxIcon& icon);
virtual void SetIcons(const wxIconBundle& icons); virtual void SetIcons(const wxIconBundle& icons);
@ -58,7 +58,7 @@ public:
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
virtual bool Show(bool show = TRUE); virtual bool Show(bool show = true);
virtual void Raise(); virtual void Raise();
@ -87,7 +87,6 @@ public:
// do *not* call this to iconize the frame, this is a private function! // do *not* call this to iconize the frame, this is a private function!
void SetIconizeState(bool iconic); void SetIconizeState(bool iconic);
wxString m_title;
int m_miniEdge, int m_miniEdge,
m_miniTitle; m_miniTitle;
GtkWidget *m_mainWidget; GtkWidget *m_mainWidget;
@ -118,6 +117,8 @@ protected:
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize( int *width, int *height ) const; virtual void DoGetClientSize( int *width, int *height ) const;
wxString m_title;
// is the frame currently iconized? // is the frame currently iconized?
bool m_isIconized; bool m_isIconized;
// is the frame currently grabbed explicitly // is the frame currently grabbed explicitly

16
include/wx/gtk1/mdi.h
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gtk/mdi.h // Name: wx/gtk/mdi.h
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@ -140,11 +140,11 @@ public:
// no size hints // no size hints
virtual void DoSetSizeHints( int WXUNUSED(minW), virtual void DoSetSizeHints( int WXUNUSED(minW),
int WXUNUSED(minH), int WXUNUSED(minH),
int WXUNUSED(maxW) = -1, int WXUNUSED(maxW) = wxDefaultCoord,
int WXUNUSED(maxH) = -1, int WXUNUSED(maxH) = wxDefaultCoord,
int WXUNUSED(incW) = -1, int WXUNUSED(incW) = wxDefaultCoord,
int WXUNUSED(incH) = -1) {} int WXUNUSED(incH) = wxDefaultCoord) {}
#if wxUSE_TOOLBAR #if wxUSE_TOOLBAR
// no toolbar // no toolbar
@ -162,8 +162,7 @@ public:
{ wxTopLevelWindowBase::SetIcons(icons); } { wxTopLevelWindowBase::SetIcons(icons); }
// no title // no title
void SetTitle( const wxString &title ); virtual void SetTitle( const wxString &title );
wxString GetTitle() const { return m_title; }
// no maximize etc // no maximize etc
virtual void Maximize( bool WXUNUSED(maximize) = true ) { } virtual void Maximize( bool WXUNUSED(maximize) = true ) { }
@ -213,4 +212,3 @@ private:
}; };
#endif // __MDIH__ #endif // __MDIH__

9
include/wx/gtk1/toplevel.h
View File

@ -43,9 +43,9 @@ public:
virtual ~wxTopLevelWindowGTK(); virtual ~wxTopLevelWindowGTK();
// implement base class pure virtuals // implement base class pure virtuals
virtual void Maximize(bool maximize = TRUE); virtual void Maximize(bool maximize = true);
virtual bool IsMaximized() const; virtual bool IsMaximized() const;
virtual void Iconize(bool iconize = TRUE); virtual void Iconize(bool iconize = true);
virtual bool IsIconized() const; virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon); virtual void SetIcon(const wxIcon& icon);
virtual void SetIcons(const wxIconBundle& icons); virtual void SetIcons(const wxIconBundle& icons);
@ -58,7 +58,7 @@ public:
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
virtual bool Show(bool show = TRUE); virtual bool Show(bool show = true);
virtual void Raise(); virtual void Raise();
@ -87,7 +87,6 @@ public:
// do *not* call this to iconize the frame, this is a private function! // do *not* call this to iconize the frame, this is a private function!
void SetIconizeState(bool iconic); void SetIconizeState(bool iconic);
wxString m_title;
int m_miniEdge, int m_miniEdge,
m_miniTitle; m_miniTitle;
GtkWidget *m_mainWidget; GtkWidget *m_mainWidget;
@ -118,6 +117,8 @@ protected:
virtual void DoSetClientSize(int width, int height); virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize( int *width, int *height ) const; virtual void DoGetClientSize( int *width, int *height ) const;
wxString m_title;
// is the frame currently iconized? // is the frame currently iconized?
bool m_isIconized; bool m_isIconized;
// is the frame currently grabbed explicitly // is the frame currently grabbed explicitly

3
include/wx/toplevel.h
View File

@ -155,7 +155,8 @@ public:
virtual bool IsFullScreen() const = 0; virtual bool IsFullScreen() const = 0;
#if defined(__WXMSW__) || \ #if defined(__WXMSW__) || \
defined(__WXMOTIF__) defined(__WXMOTIF__) || \
defined(__WXGTK__)
// FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow // FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
// to wxTopLevelWindow so initially enabled in wxMSW only to observe results // to wxTopLevelWindow so initially enabled in wxMSW only to observe results

3
include/wx/window.h
View File

@ -169,7 +169,8 @@ public:
// ----------------- // -----------------
#if !defined(__WXMSW__) && \ #if !defined(__WXMSW__) && \
!defined(__WXMOTIF__) !defined(__WXMOTIF__) && \
!defined(__WXGTK__)
// FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow // FIXME: This is work in progress about moving SetTitle/GetTitle from wxWindow
// to wxTopLevelWindow so initially enabled in wxMSW only to observe results // to wxTopLevelWindow so initially enabled in wxMSW only to observe results

10
src/gtk/toplevel.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: toplevel.cpp // Name: src/gtk/toplevel.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@ -371,7 +371,7 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
GdkEvent * WXUNUSED(event), GdkEvent * WXUNUSED(event),
wxTopLevelWindow *win ) wxTopLevelWindow *win )
{ {
win->SetIconizeState(TRUE); win->SetIconizeState(true);
} }
} }
@ -704,7 +704,7 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
{ {
if (m_grabbed) if (m_grabbed)
{ {
wxASSERT_MSG( FALSE, _T("Window still grabbed")); wxASSERT_MSG( false, _T("Window still grabbed"));
RemoveGrab(); RemoveGrab();
} }
@ -1130,7 +1130,11 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title )
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
if ( title == m_title )
return;
m_title = title; m_title = title;
gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) ); gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
} }

10
src/gtk1/toplevel.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: toplevel.cpp // Name: src/gtk/toplevel.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Id: $Id$ // Id: $Id$
@ -371,7 +371,7 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget),
GdkEvent * WXUNUSED(event), GdkEvent * WXUNUSED(event),
wxTopLevelWindow *win ) wxTopLevelWindow *win )
{ {
win->SetIconizeState(TRUE); win->SetIconizeState(true);
} }
} }
@ -704,7 +704,7 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
{ {
if (m_grabbed) if (m_grabbed)
{ {
wxASSERT_MSG( FALSE, _T("Window still grabbed")); wxASSERT_MSG( false, _T("Window still grabbed"));
RemoveGrab(); RemoveGrab();
} }
@ -1130,7 +1130,11 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title )
{ {
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
if ( title == m_title )
return;
m_title = title; m_title = title;
gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) ); gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
} }