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

Second part of '[ 1216148 ] cleanup: unused variables and declarations'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-08 14:49:36 +00:00
parent 8fbe65e96d
commit 91af089567
18 changed files with 280 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/gtk/frame.cpp
View File

@@ -58,7 +58,6 @@ const int wxPLACE_HOLDER = 0;
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
extern int g_openDialogs;
// ----------------------------------------------------------------------------
// event tables
@@ -85,7 +84,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
{
if (!win->m_hasVMT) return;
win->m_menuBarDetached = FALSE;
win->m_menuBarDetached = false;
win->GtkUpdateSize();
}
}
@@ -105,7 +104,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
// Raise the client area area
gdk_window_raise( win->m_wxwindow->window );
win->m_menuBarDetached = TRUE;
win->m_menuBarDetached = true;
win->GtkUpdateSize();
}
}
@@ -122,7 +121,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
{
if (!win->m_hasVMT) return;
win->m_toolBarDetached = FALSE;
win->m_toolBarDetached = false;
win->GtkUpdateSize();
}
}
@@ -142,7 +141,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
// Raise the client area area
gdk_window_raise( win->m_wxwindow->window );
win->m_toolBarDetached = TRUE;
win->m_toolBarDetached = true;
win->GtkUpdateSize();
}
}
@@ -176,7 +175,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
child->m_y,
child->m_width,
child->m_height );
#if wxUSE_TOOLBAR_NATIVE
// We connect to these events for recalculating the client area
// space when the toolbar is floating
@@ -204,7 +203,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
child->m_width,
child->m_height );
}
// Resize on OnInternalIdle
parent->GtkUpdateSize();
}
@@ -215,8 +214,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
void wxFrame::Init()
{
m_menuBarDetached = FALSE;
m_toolBarDetached = FALSE;
m_menuBarDetached = false;
m_toolBarDetached = false;
m_menuBarHeight = 2;
}
@@ -231,13 +230,13 @@ bool wxFrame::Create( wxWindow *parent,
bool rt = wxTopLevelWindow::Create(parent, id, title, pos, sizeOrig,
style, name);
m_insertCallback = (wxInsertChildFunction) wxInsertChildInFrame;
return rt;
}
wxFrame::~wxFrame()
{
m_isBeingDeleted = TRUE;
m_isBeingDeleted = true;
DeleteAllBars();
}
@@ -352,7 +351,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
// avoid recursions
if (m_resizing) return;
m_resizing = TRUE;
m_resizing = true;
// this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
@@ -498,7 +497,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
}
#endif // wxUSE_STATUSBAR
m_sizeSet = TRUE;
m_sizeSet = true;
// send size event to frame
wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -515,7 +514,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
}
#endif // wxUSE_STATUSBAR
m_resizing = FALSE;
m_resizing = false;
}
void wxFrame::OnInternalIdle()
@@ -602,7 +601,7 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
gtk_signal_connect( GTK_OBJECT(menuBar->m_widget), "child_detached",
GTK_SIGNAL_FUNC(gtk_menu_detached_callback), (gpointer)this );
}
gtk_widget_show( m_frameMenuBar->m_widget );
UpdateMenuBarSize();
@@ -620,7 +619,7 @@ void wxFrame::UpdateMenuBarSize()
req.width = 2;
req.height = 2;
// this is called after Remove with a NULL m_frameMenuBar
if ( m_frameMenuBar )
(* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_frameMenuBar->m_widget) )->size_request )
@@ -641,11 +640,11 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
m_insertInClientArea = FALSE;
m_insertInClientArea = false;
m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
m_insertInClientArea = TRUE;
m_insertInClientArea = true;
GtkUpdateSize();
@@ -700,10 +699,10 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
void wxFrame::SetStatusBar(wxStatusBar *statbar)
{
bool hadStatBar = m_frameStatusBar != NULL;
wxFrameBase::SetStatusBar(statbar);
if (hadStatBar && !m_frameStatusBar)
if (hadStatBar && !m_frameStatusBar)
GtkUpdateSize();
}