Make keyboard input to controls in a wxPopupWindow work in at least some cases, embed...

[wxWidgets.git] / src / gtk1 / mdi.cpp

diff --git a/src/gtk1/mdi.cpp b/src/gtk1/mdi.cpp
index 0b0c9d4abb557a396342fb39cb1ca376c6d95df9..eeff4813e4c0d02c21186bb063feb78dece841a6 100644 (file)
--- a/src/gtk1/mdi.cpp
+++ b/src/gtk1/mdi.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/gtk/mdi.cpp
+// Name:        src/gtk1/mdi.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,20 +10,23 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#if wxUSE_MDI
+

 #include "wx/mdi.h"
 #include "wx/mdi.h"

-#include "wx/notebook.h"

 
 

-#if wxUSE_MDI
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+#endif

 
 

-#include "wx/dialog.h"
-#include "wx/menu.h"
-#include "wx/intl.h"
-#include "wx/gtk/private.h"
+#include "wx/notebook.h"
+#include "wx/gtk1/private.h"

 
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>

-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk1/win_gtk.h"

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -42,8 +45,6 @@ extern bool g_isIdle;
 // globals
 //-----------------------------------------------------------------------------
 
 // globals
 //-----------------------------------------------------------------------------
 

-extern wxList wxPendingDelete;
-

 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "switch_page"
 //-----------------------------------------------------------------------------


@@ -65,7 +66,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
     {
         wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );
         event1.SetEventObject( child);
     {
         wxActivateEvent event1( wxEVT_ACTIVATE, false, child->GetId() );
         event1.SetEventObject( child);

-        child->GetEventHandler()->ProcessEvent( event1 );
+        child->HandleWindowEvent( event1 );

     }
 
     // send activate event to new child
     }
 
     // send activate event to new child


@@ -99,7 +100,7 @@ gtk_mdi_page_change_callback( GtkNotebook *WXUNUSED(widget),
 
     wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );
     event2.SetEventObject( child);
 
     wxActivateEvent event2( wxEVT_ACTIVATE, true, child->GetId() );
     event2.SetEventObject( child);

-    child->GetEventHandler()->ProcessEvent( event2 );
+    child->HandleWindowEvent( event2 );

 }
 }
 
 }
 }
 


@@ -127,11 +128,12 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
                               long style,
                               const wxString& name )
 {
                               long style,
                               const wxString& name )
 {

-    wxFrame::Create( parent, id, title, pos, size, style, name );
+    if ( !wxFrame::Create( parent, id, title, pos, size, style, name ) )
+        return false;

 
 

-    OnCreateClient();
+    m_clientWindow = OnCreateClient();

 
 

-    return true;
+    return m_clientWindow != NULL;

 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )
 }
 
 void wxMDIParentFrame::GtkOnSize( int x, int y, int width, int height )


@@ -289,8 +291,7 @@ wxMDIClientWindow *wxMDIParentFrame::GetClientWindow() const
 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
 
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {

-    m_clientWindow = new wxMDIClientWindow( this );
-    return m_clientWindow;
+    return new wxMDIClientWindow( this );

 }
 
 void wxMDIParentFrame::ActivateNext()
 }
 
 void wxMDIParentFrame::ActivateNext()


@@ -408,7 +409,7 @@ void wxMDIChildFrame::OnMenuHighlight( wxMenuEvent& event )
 {
 #if wxUSE_STATUSBAR
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();
 {
 #if wxUSE_STATUSBAR
     wxMDIParentFrame *mdi_frame = (wxMDIParentFrame*)m_parent->GetParent();

-    if ( !ShowMenuHelp(mdi_frame->GetStatusBar(), event.GetMenuId()) )
+    if ( !ShowMenuHelp(event.GetMenuId()) )

     {
         // we don't have any help text for this item, but may be the MDI frame
         // does?
     {
         // we don't have any help text for this item, but may be the MDI frame
         // does?