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

common functions moved into ../common/framecmn.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-07-23 16:03:53 +00:00
parent 96fd301f0e
commit 19717c50b9
2 changed files with 26 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/gtk/frame.cpp
View File

@@ -5,7 +5,7 @@
// Created: 01/02/97 // Created: 01/02/97
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -72,7 +72,7 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
wxFrame::wxFrame(void) wxFrame::wxFrame()
{ {
m_doingOnSize = FALSE; m_doingOnSize = FALSE;
m_frameMenuBar = NULL; m_frameMenuBar = NULL;
@@ -144,7 +144,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
return TRUE; return TRUE;
}; };
wxFrame::~wxFrame(void) wxFrame::~wxFrame()
{ {
if (m_frameMenuBar) delete m_frameMenuBar; if (m_frameMenuBar) delete m_frameMenuBar;
if (m_frameStatusBar) delete m_frameStatusBar; if (m_frameStatusBar) delete m_frameStatusBar;
@@ -180,7 +180,7 @@ void wxFrame::OnCloseWindow( wxCloseEvent &event )
} }
}; };
bool wxFrame::Destroy(void) bool wxFrame::Destroy()
{ {
if (!wxPendingDelete.Member(this)) if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this); wxPendingDelete.Append(this);
@@ -300,7 +300,8 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
while (node) while (node)
{ {
wxMenuItem *menuitem = (wxMenuItem*)node->Data(); wxMenuItem *menuitem = (wxMenuItem*)node->Data();
if (menuitem->m_isSubMenu) SetInvokingWindow( menuitem->m_subMenu, win ); if (menuitem->IsSubMenu())
SetInvokingWindow( menuitem->GetSubMenu(), win );
node = node->Next(); node = node->Next();
}; };
}; };
@@ -349,12 +350,12 @@ void wxFrame::SetStatusWidths( int n, int *width )
if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width ); if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
}; };
wxStatusBar *wxFrame::GetStatusBar(void) wxStatusBar *wxFrame::GetStatusBar()
{ {
return m_frameStatusBar; return m_frameStatusBar;
}; };
wxMenuBar *wxFrame::GetMenuBar(void) wxMenuBar *wxFrame::GetMenuBar()
{ {
return m_frameMenuBar; return m_frameMenuBar;
}; };
@@ -365,59 +366,11 @@ void wxFrame::SetTitle( const wxString &title )
gtk_window_set_title( GTK_WINDOW(m_widget), title ); gtk_window_set_title( GTK_WINDOW(m_widget), title );
}; };
wxString wxFrame::GetTitle(void) const void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW)
{ {
return (wxString&)m_title; // VZ: I don't know a way to set the max size for the window in GTK and have
}; // no idea about what incW might be
gtk_widget_set_usize(m_widget, minW, minH);
void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
{
DoMenuUpdates();
} }
// Query app for menu item updates (called from OnIdle) #include "../common/framecmn.cpp"
void wxFrame::DoMenuUpdates(void)
{
wxMenuBar* bar = GetMenuBar();
if (!bar) return;
wxNode *node = bar->m_menus.First();
while (node)
{
wxMenu* menu = (wxMenu*)node->Data();
DoMenuUpdates(menu);
node = node->Next();
};
}
void wxFrame::DoMenuUpdates(wxMenu* menu)
{
wxNode* node = menu->m_items.First();
while (node)
{
wxMenuItem* item = (wxMenuItem*) node->Data();
if ( !item->IsSeparator() )
{
wxWindowID id = item->GetId();
wxUpdateUIEvent event(id);
event.SetEventObject( this );
if (GetEventHandler()->ProcessEvent(event))
{
if (event.GetSetText())
menu->SetLabel(id, event.GetText());
if (event.GetSetChecked())
menu->Check(id, event.GetChecked());
if (event.GetSetEnabled())
menu->Enable(id, event.GetEnabled());
}
if (item->GetSubMenu())
DoMenuUpdates(item->GetSubMenu());
}
node = node->Next();
}
}

73
src/gtk1/frame.cpp
View File

@@ -5,7 +5,7 @@
// Created: 01/02/97 // Created: 01/02/97
// Id: // Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem // Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__ #ifdef __GNUG__
@@ -72,7 +72,7 @@ END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow) IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
wxFrame::wxFrame(void) wxFrame::wxFrame()
{ {
m_doingOnSize = FALSE; m_doingOnSize = FALSE;
m_frameMenuBar = NULL; m_frameMenuBar = NULL;
@@ -144,7 +144,7 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
return TRUE; return TRUE;
}; };
wxFrame::~wxFrame(void) wxFrame::~wxFrame()
{ {
if (m_frameMenuBar) delete m_frameMenuBar; if (m_frameMenuBar) delete m_frameMenuBar;
if (m_frameStatusBar) delete m_frameStatusBar; if (m_frameStatusBar) delete m_frameStatusBar;
@@ -180,7 +180,7 @@ void wxFrame::OnCloseWindow( wxCloseEvent &event )
} }
}; };
bool wxFrame::Destroy(void) bool wxFrame::Destroy()
{ {
if (!wxPendingDelete.Member(this)) if (!wxPendingDelete.Member(this))
wxPendingDelete.Append(this); wxPendingDelete.Append(this);
@@ -300,7 +300,8 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win )
while (node) while (node)
{ {
wxMenuItem *menuitem = (wxMenuItem*)node->Data(); wxMenuItem *menuitem = (wxMenuItem*)node->Data();
if (menuitem->m_isSubMenu) SetInvokingWindow( menuitem->m_subMenu, win ); if (menuitem->IsSubMenu())
SetInvokingWindow( menuitem->GetSubMenu(), win );
node = node->Next(); node = node->Next();
}; };
}; };
@@ -349,12 +350,12 @@ void wxFrame::SetStatusWidths( int n, int *width )
if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width ); if (m_frameStatusBar) m_frameStatusBar->SetStatusWidths( n, width );
}; };
wxStatusBar *wxFrame::GetStatusBar(void) wxStatusBar *wxFrame::GetStatusBar()
{ {
return m_frameStatusBar; return m_frameStatusBar;
}; };
wxMenuBar *wxFrame::GetMenuBar(void) wxMenuBar *wxFrame::GetMenuBar()
{ {
return m_frameMenuBar; return m_frameMenuBar;
}; };
@@ -365,59 +366,11 @@ void wxFrame::SetTitle( const wxString &title )
gtk_window_set_title( GTK_WINDOW(m_widget), title ); gtk_window_set_title( GTK_WINDOW(m_widget), title );
}; };
wxString wxFrame::GetTitle(void) const void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int incW)
{ {
return (wxString&)m_title; // VZ: I don't know a way to set the max size for the window in GTK and have
}; // no idea about what incW might be
gtk_widget_set_usize(m_widget, minW, minH);
void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
{
DoMenuUpdates();
} }
// Query app for menu item updates (called from OnIdle) #include "../common/framecmn.cpp"
void wxFrame::DoMenuUpdates(void)
{
wxMenuBar* bar = GetMenuBar();
if (!bar) return;
wxNode *node = bar->m_menus.First();
while (node)
{
wxMenu* menu = (wxMenu*)node->Data();
DoMenuUpdates(menu);
node = node->Next();
};
}
void wxFrame::DoMenuUpdates(wxMenu* menu)
{
wxNode* node = menu->m_items.First();
while (node)
{
wxMenuItem* item = (wxMenuItem*) node->Data();
if ( !item->IsSeparator() )
{
wxWindowID id = item->GetId();
wxUpdateUIEvent event(id);
event.SetEventObject( this );
if (GetEventHandler()->ProcessEvent(event))
{
if (event.GetSetText())
menu->SetLabel(id, event.GetText());
if (event.GetSetChecked())
menu->Check(id, event.GetChecked());
if (event.GetSetEnabled())
menu->Enable(id, event.GetEnabled());
}
if (item->GetSubMenu())
DoMenuUpdates(item->GetSubMenu());
}
node = node->Next();
}
}