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

wxUniv compilation fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-10 12:25:46 +00:00
parent 7c36b6a2a1
commit 6522713c75
37 changed files with 170 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gtk1/frame.cpp
View File

@@ -153,7 +153,8 @@ static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WX
return TRUE;
}
#if wxUSE_MENUS
#if wxUSE_MENUS_NATIVE
//-----------------------------------------------------------------------------
// "child_attached" of menu bar
//-----------------------------------------------------------------------------
@@ -177,7 +178,8 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
win->m_menuBarDetached = TRUE;
win->GtkUpdateSize();
}
#endif // wxUSE_MENUS
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_TOOLBAR
//-----------------------------------------------------------------------------
@@ -1050,17 +1052,14 @@ void wxFrameGTK::OnInternalIdle()
// menu/tool/status bar stuff
// ----------------------------------------------------------------------------
#if wxUSE_MENUS
#if wxUSE_MENUS_NATIVE
void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar )
void wxFrameGTK::DetachMenuBar()
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
if (menuBar == m_frameMenuBar)
return;
if (m_frameMenuBar)
if ( m_frameMenuBar )
{
m_frameMenuBar->UnsetInvokingWindow( this );
@@ -1078,7 +1077,12 @@ void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar )
gtk_widget_unparent( m_frameMenuBar->m_widget );
}
m_frameMenuBar = menuBar;
wxFrameBase::DetachMenuBar();
}
void wxFrameGTK::AttachMenuBar( wxMenuBar *menuBar )
{
wxFrameBase::AttachMenuBar(menuBar);
if (m_frameMenuBar)
{
@@ -1108,7 +1112,7 @@ void wxFrameGTK::SetMenuBar( wxMenuBar *menuBar )
m_sizeSet = FALSE;
}
#endif // wxUSE_MENUS
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_TOOLBAR

6
src/gtk1/popupwin.cpp
View File

@@ -141,11 +141,11 @@ static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
// wxPopupWindow
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxPopupWindow,wxPopupWindowBase)
EVT_SIZE (wxPopupWindow::OnSize)
BEGIN_EVENT_TABLE(wxPopupWindow, wxPopupWindowBase)
EVT_SIZE(wxPopupWindow::OnSize)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow,wxPopupWindowBase)
IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
bool wxPopupWindow::Create( wxWindow *parent, int style )
{

12
src/gtk1/window.cpp
View File

@@ -2260,11 +2260,13 @@ wxWindow *wxGetActiveWindow()
// wxWindowGTK
//-----------------------------------------------------------------------------
// in wxUniv/MSW this class is abstract because it doesn't have DoPopupMenu()
// method
#ifdef __WXUNIVERSAL__
IMPLEMENT_DYNAMIC_CLASS(wxWindowGTK, wxWindowBase)
#else
IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
#else // __WXGTK__
IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
#endif
#endif // __WXUNIVERSAL__/__WXGTK__
void wxWindowGTK::Init()
{
@@ -3605,7 +3607,7 @@ void wxWindowGTK::ApplyWidgetStyle()
// Pop-up menu stuff
//-----------------------------------------------------------------------------
#if wxUSE_MENUS
#if wxUSE_MENUS_NATIVE
static void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting )
{
@@ -3677,7 +3679,7 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
return TRUE;
}
#endif // wxUSE_MENUS
#endif // wxUSE_MENUS_NATIVE
#if wxUSE_DRAG_AND_DROP