Get/SetTitle only for wxTopLevelWindow (wxGTK part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: minifram.cpp
|
||||
// Name: src/gtk/minifram.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
@@ -82,7 +82,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
|
||||
0, 0,
|
||||
win->m_width, win->m_height );
|
||||
|
||||
if (!win->GetTitle().IsEmpty() &&
|
||||
if (!win->GetTitle().empty() &&
|
||||
((win->GetWindowStyle() & wxCAPTION) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
|
||||
@@ -129,7 +129,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
|
||||
0, 0,
|
||||
win->m_width, win->m_height );
|
||||
|
||||
if (!win->m_title.IsEmpty() &&
|
||||
if (!win->GetTitle().empty() &&
|
||||
((win->GetWindowStyle() & wxCAPTION) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
|
||||
@@ -200,7 +200,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
|
||||
win->m_oldX = 0;
|
||||
win->m_oldY = 0;
|
||||
|
||||
win->m_isDragging = TRUE;
|
||||
win->m_isDragging = true;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -332,7 +332,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
|
||||
m_miniTitle = 13;
|
||||
|
||||
m_miniEdge = 3;
|
||||
m_isDragging = FALSE;
|
||||
m_isDragging = false;
|
||||
m_oldX = -1;
|
||||
m_oldY = -1;
|
||||
m_diffX = 0;
|
||||
@@ -394,7 +394,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
|
||||
gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event",
|
||||
GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxMiniFrame::SetTitle( const wxString &title )
|
||||
|
@@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: minifram.cpp
|
||||
// Name: src/gtk/minifram.cpp
|
||||
// Purpose:
|
||||
// Author: Robert Roebling
|
||||
// Id: $Id$
|
||||
@@ -82,7 +82,7 @@ static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *g
|
||||
0, 0,
|
||||
win->m_width, win->m_height );
|
||||
|
||||
if (!win->GetTitle().IsEmpty() &&
|
||||
if (!win->GetTitle().empty() &&
|
||||
((win->GetWindowStyle() & wxCAPTION) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
|
||||
@@ -129,7 +129,7 @@ static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNU
|
||||
0, 0,
|
||||
win->m_width, win->m_height );
|
||||
|
||||
if (!win->m_title.IsEmpty() &&
|
||||
if (!win->GetTitle().empty() &&
|
||||
((win->GetWindowStyle() & wxCAPTION) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_HORIZ) ||
|
||||
(win->GetWindowStyle() & wxTINY_CAPTION_VERT)))
|
||||
@@ -200,7 +200,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton
|
||||
win->m_oldX = 0;
|
||||
win->m_oldY = 0;
|
||||
|
||||
win->m_isDragging = TRUE;
|
||||
win->m_isDragging = true;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -332,7 +332,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
|
||||
m_miniTitle = 13;
|
||||
|
||||
m_miniEdge = 3;
|
||||
m_isDragging = FALSE;
|
||||
m_isDragging = false;
|
||||
m_oldX = -1;
|
||||
m_oldY = -1;
|
||||
m_diffX = 0;
|
||||
@@ -394,7 +394,7 @@ bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title
|
||||
gtk_signal_connect( GTK_OBJECT(m_mainWidget), "motion_notify_event",
|
||||
GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
|
||||
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
void wxMiniFrame::SetTitle( const wxString &title )
|
||||
|
Reference in New Issue
Block a user