1. reset default item in ~wxWindow (better to be safe)

[wxWidgets.git] / utils / serialize / serwnd.cpp

diff --git a/utils/serialize/serwnd.cpp b/utils/serialize/serwnd.cpp
index 7c8fc6d161b7b3ff3aa88a9ad64f0a0e8fdfaf42..a7790942cc5bfa28c5348e11186c683339709f36 100644 (file)
--- a/utils/serialize/serwnd.cpp
+++ b/utils/serialize/serwnd.cpp
@@ -26,6 +26,7 @@
 #include <wx/serbase.h>
 #include <wx/statusbr.h>
 #include <wx/mdi.h>
 #include <wx/serbase.h>
 #include <wx/statusbr.h>
 #include <wx/mdi.h>

+#include "wx/log.h"

 #include "serwnd.h"
 
 
 #include "serwnd.h"
 
 


@@ -40,20 +41,25 @@ IMPLEMENT_SERIAL_CLASS(wxMenuBar, wxWindow)
 IMPLEMENT_SERIAL_CLASS(wxMenuItem, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxMenu, wxObject)
 
 IMPLEMENT_SERIAL_CLASS(wxMenuItem, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxMenu, wxObject)
 

+IMPLEMENT_SERIAL_CLASS(wxMDIParentFrame, wxFrame)
+IMPLEMENT_SERIAL_CLASS(wxMDIChildFrame, wxFrame)
+IMPLEMENT_SERIAL_CLASS(wxMDIClientWindow, wxWindow)
+

 /////////////////////////////////////////////////////////////////////////////
 
 void WXSERIAL(wxWindow)::StoreObject(wxObjectOutputStream& s)
 {
   wxWindow *win_object = (wxWindow *)Object();
 /////////////////////////////////////////////////////////////////////////////
 
 void WXSERIAL(wxWindow)::StoreObject(wxObjectOutputStream& s)
 {
   wxWindow *win_object = (wxWindow *)Object();

-  wxNode *node = win_object->GetChildren()->First();

 
   if (s.FirstStage()) {
 
   if (s.FirstStage()) {

+    wxNode *node = win_object->GetChildren()->First();
+

     s.AddChild(win_object->GetConstraints());
     s.AddChild(win_object->GetValidator());
 
     // BAD HACK, but I don't have access to the internal variable of wxWindow.
     s.AddChild(win_object->GetConstraints());
     s.AddChild(win_object->GetValidator());
 
     // BAD HACK, but I don't have access to the internal variable of wxWindow.

-    m_bg_colour = win_object->GetDefaultBackgroundColour();
-    m_fg_colour = win_object->GetDefaultForegroundColour();
+    m_bg_colour = win_object->GetBackgroundColour();
+    m_fg_colour = win_object->GetForegroundColour();

     s.AddChild(&m_bg_colour);
     s.AddChild(&m_fg_colour);
     s.AddChild(win_object->GetFont());
     s.AddChild(&m_bg_colour);
     s.AddChild(&m_fg_colour);
     s.AddChild(win_object->GetFont());


@@ -67,14 +73,16 @@ void WXSERIAL(wxWindow)::StoreObject(wxObjectOutputStream& s)
   wxDataOutputStream data(s);
   int x,y,w,h;
 
   wxDataOutputStream data(s);
   int x,y,w,h;
 

-  data.WriteString(win_object->GetName());
-  data.WriteString(win_object->GetLabel());
-  data.WriteString(win_object->GetTitle());
+  data.WriteString( win_object->GetName() );
+  data.WriteString( win_object->GetLabel() );
+  data.WriteString( win_object->GetTitle() );

 
 

-  data.Write8(win_object->GetAutoLayout());
-  data.Write8(win_object->IsShown());
+  data.Write8( win_object->GetAutoLayout() );
+  data.Write8( win_object->IsShown() );

   data.Write32( win_object->GetWindowStyleFlag() );
   data.Write32( win_object->GetWindowStyleFlag() );

-  data.Write32(win_object->GetId());
+  data.Write32( win_object->GetId() );
+  wxLogDebug( "Number = %d", win_object->GetChildren()->Number() );
+  data.Write8( win_object->GetChildren()->Number() );

 
   win_object->GetSize(&w, &h);
   win_object->GetPosition(&x, &y);
 
   win_object->GetSize(&w, &h);
   win_object->GetPosition(&x, &y);


@@ -88,6 +96,26 @@ void WXSERIAL(wxWindow)::LoadObject(wxObjectInputStream& s)
 {
   wxDataInputStream data_s(s);
   wxWindow *win_object = (wxWindow *)Object();
 {
   wxDataInputStream data_s(s);
   wxWindow *win_object = (wxWindow *)Object();

+  wxColour *colour;
+  wxFont *font;
+
+  if (s.SecondCall()) {
+    /* I assume we will never create raw wxWindow object */
+    (void)s.GetChild(); // We pass wxLayoutConstraints.
+    (void)s.GetChild(); // We pass wxValidator.
+
+    colour = (wxColour *)s.GetChild();
+    if (colour)
+      win_object->SetBackgroundColour(*colour);
+    colour = (wxColour *)s.GetChild();
+    if (colour)
+      win_object->SetForegroundColour(*colour);
+    font = (wxFont *)s.GetChild();
+    if (font)
+      win_object->SetFont(*font);
+    s.RemoveChildren(m_number);
+    return;
+  }

 
   m_parent = (wxWindow *)s.GetParent();
 
 
   m_parent = (wxWindow *)s.GetParent();
 


@@ -99,18 +127,22 @@ void WXSERIAL(wxWindow)::LoadObject(wxObjectInputStream& s)
   m_shown       = data_s.Read8();
   m_style       = data_s.Read32();
   m_id          = data_s.Read32();
   m_shown       = data_s.Read8();
   m_style       = data_s.Read32();
   m_id          = data_s.Read32();

+  m_number      = data_s.Read8();

 
   m_x = data_s.Read16();
   m_y = data_s.Read16();
   m_w = data_s.Read16();
   m_h = data_s.Read16();
 
 
   m_x = data_s.Read16();
   m_y = data_s.Read16();
   m_w = data_s.Read16();
   m_h = data_s.Read16();
 

-  /* I assume we will never create raw wxWindow object */
+  (void)s.GetChild(); // We pass wxLayoutConstraints.
+
+  m_validator = (wxValidator *)s.GetChild();
+  if (!m_validator)
+    m_validator = (wxValidator *)&wxDefaultValidator;
+
+  s.RemoveChildren(m_number+3);

 
 

-  m_validator = (wxValidator *)s.GetChild(1);
-  win_object->SetDefaultBackgroundColour(*((wxColour *)s.GetChild(2)));
-  win_object->SetDefaultForegroundColour(*((wxColour *)s.GetChild(3)));
-  win_object->SetFont(*((wxFont *)s.GetChild(4)));
+  s.Recall();

 
   return;
 }
 
   return;
 }


@@ -219,6 +251,9 @@ void WXSERIAL(wxFrame)::StoreObject(wxObjectOutputStream& s)
 
   wxDataOutputStream data_s(s);
   wxStatusBar *statbar = frame->GetStatusBar();
 
   wxDataOutputStream data_s(s);
   wxStatusBar *statbar = frame->GetStatusBar();

+
+  // AAARGH !! I absolutely need to be able to modify internal fields of
+  // wxFrame (wxToolBar and wxStatusBar)

  
   if (statbar)
     data_s.Write8(statbar->GetFieldsCount());
  
   if (statbar)
     data_s.Write8(statbar->GetFieldsCount());


@@ -231,17 +266,19 @@ void WXSERIAL(wxFrame)::StoreObject(wxObjectOutputStream& s)
 void WXSERIAL(wxFrame)::LoadObject(wxObjectInputStream& s)
 {
   wxFrame *frame = (wxFrame *)Object();
 void WXSERIAL(wxFrame)::LoadObject(wxObjectInputStream& s)
 {
   wxFrame *frame = (wxFrame *)Object();

-  wxMenuBar *mbar = (wxMenuBar *)s.GetChild(0);
+  wxMenuBar *mbar = (wxMenuBar *)s.GetChild();

 
 

-  s.RemoveChildren(1);

   WXSERIAL(wxWindow)::LoadObject(s);
 
   WXSERIAL(wxWindow)::LoadObject(s);
 

+  if (s.SecondCall())
+    return;
+

   wxDataInputStream data_s(s);
 
   wxDataInputStream data_s(s);
 

-  frame->SetMenuBar(mbar);

   if (frame->GetClassInfo() == CLASSINFO(wxFrame))
     frame->Create(m_parent, m_id, m_title, wxPoint(m_x, m_y),
                   wxSize(m_w, m_h), m_style, m_name);
   if (frame->GetClassInfo() == CLASSINFO(wxFrame))
     frame->Create(m_parent, m_id, m_title, wxPoint(m_x, m_y),
                   wxSize(m_w, m_h), m_style, m_name);

+  frame->SetMenuBar(mbar);

 
   frame->CreateStatusBar(data_s.Read8());
 }
 
   frame->CreateStatusBar(data_s.Read8());
 }


@@ -275,7 +312,7 @@ void WXSERIAL(wxMenuBar)::LoadObject(wxObjectInputStream& s)
 
   mcount = data_s.Read8();
   for (i=0;i<mcount;i++) {
 
   mcount = data_s.Read8();
   for (i=0;i<mcount;i++) {

-    wxMenu *menu = (wxMenu *)s.GetChild(0);
+    wxMenu *menu = (wxMenu *)s.GetChild();

     mbar->Append( menu, menu->GetTitle() );
   }
 
     mbar->Append( menu, menu->GetTitle() );
   }
 


@@ -301,12 +338,12 @@ void WXSERIAL(wxMenu)::StoreObject(wxObjectOutputStream& s)
 void WXSERIAL(wxMenu)::LoadObject(wxObjectInputStream& s)
 {
   wxMenu *menu = (wxMenu *)Object();
 void WXSERIAL(wxMenu)::LoadObject(wxObjectInputStream& s)
 {
   wxMenu *menu = (wxMenu *)Object();

-  wxList *items = (wxList *)s.GetChild(0);
+  wxList *items = (wxList *)s.GetChild();

   wxNode *node = items->First();
 
   wxDataInputStream data_s(s);
 
   wxNode *node = items->First();
 
   wxDataInputStream data_s(s);
 

-//  menu->SetTitle( data_s.ReadString() );
+  menu->SetTitle( data_s.ReadString() );

 
   while (node) {
 // NOT IMPLEMENTED in wxGTK
 
   while (node) {
 // NOT IMPLEMENTED in wxGTK


@@ -322,17 +359,21 @@ void WXSERIAL(wxMenuItem)::StoreObject(wxObjectOutputStream& s)
   wxMenuItem *item = (wxMenuItem *)Object();
 
   if (s.FirstStage()) {
   wxMenuItem *item = (wxMenuItem *)Object();
 
   if (s.FirstStage()) {

+#ifdef __WXGTK__

     s.AddChild(item->GetSubMenu());
     s.AddChild(item->GetSubMenu());

+#endif

     return;
   }
 
   wxDataOutputStream data_s(s);
 
     return;
   }
 
   wxDataOutputStream data_s(s);
 

+#ifdef __WXGTK__

   data_s.Write8( item->GetId() );
   data_s.WriteString( item->GetText() );
   data_s.Write8( item->IsCheckable() );
   data_s.Write8( item->IsEnabled() );
   data_s.Write8( item->IsChecked() );
   data_s.Write8( item->GetId() );
   data_s.WriteString( item->GetText() );
   data_s.Write8( item->IsCheckable() );
   data_s.Write8( item->IsEnabled() );
   data_s.Write8( item->IsChecked() );

+#endif

 }
 
 void WXSERIAL(wxMenuItem)::LoadObject(wxObjectInputStream& s)
 }
 
 void WXSERIAL(wxMenuItem)::LoadObject(wxObjectInputStream& s)


@@ -340,12 +381,14 @@ void WXSERIAL(wxMenuItem)::LoadObject(wxObjectInputStream& s)
   wxMenuItem *item = (wxMenuItem *)Object();
   wxDataInputStream data_s(s);
 
   wxMenuItem *item = (wxMenuItem *)Object();
   wxDataInputStream data_s(s);
 

+#ifdef __WXGTK__

   item->SetId( data_s.Read8() );
   item->SetText( data_s.ReadString() );
   item->SetCheckable( data_s.Read8() );
   item->Enable( data_s.Read8() );
   item->Check( data_s.Read8() );
   item->SetId( data_s.Read8() );
   item->SetText( data_s.ReadString() );
   item->SetCheckable( data_s.Read8() );
   item->Enable( data_s.Read8() );
   item->Check( data_s.Read8() );

-  item->SetSubMenu( (wxMenu *)s.GetChild(0) );
+  item->SetSubMenu( (wxMenu *)s.GetChild() );
+#endif

 }
 
 /////////////////////////////////////////////////////////////////////////////
 }
 
 /////////////////////////////////////////////////////////////////////////////


@@ -359,6 +402,9 @@ void WXSERIAL(wxPanel)::LoadObject(wxObjectInputStream& s)
 {
   WXSERIAL(wxWindow)::LoadObject(s);
 
 {
   WXSERIAL(wxWindow)::LoadObject(s);
 

+  if (s.SecondCall())
+    return;
+

   ((wxPanel *)Object())->Create(m_parent, m_id, wxPoint(m_x, m_y),
                                 wxSize(m_w, m_h), m_style, m_name);
 }
   ((wxPanel *)Object())->Create(m_parent, m_id, wxPoint(m_x, m_y),
                                 wxSize(m_w, m_h), m_style, m_name);
 }


@@ -374,6 +420,9 @@ void WXSERIAL(wxDialog)::LoadObject(wxObjectInputStream& s)
 {
   WXSERIAL(wxWindow)::LoadObject(s);
 
 {
   WXSERIAL(wxWindow)::LoadObject(s);
 

+  if (s.SecondCall())
+    return;
+

   ((wxDialog *)Object())->Create(m_parent, m_id, m_title, wxPoint(m_x, m_y),
                                  wxSize(m_w, m_h), m_style, m_name);
 }
   ((wxDialog *)Object())->Create(m_parent, m_id, m_title, wxPoint(m_x, m_y),
                                  wxSize(m_w, m_h), m_style, m_name);
 }


@@ -398,12 +447,52 @@ void WXSERIAL(wxMDIParentFrame)::LoadObject(wxObjectInputStream& s)
   wxMDIParentFrame *frame = (wxMDIParentFrame *)Object();
   wxMDIClientWindow *client;
 
   wxMDIParentFrame *frame = (wxMDIParentFrame *)Object();
   wxMDIClientWindow *client;
 

-  client = (wxMDIClientWindow *) s.GetChild(0);
-  s.RemoveChildren(1);
+  if (s.SecondCall()) {
+    WXSERIAL(wxFrame)::LoadObject(s);
+    return;
+  }
+
+  client = (wxMDIClientWindow *) s.GetChild();

 
   frame->Create(m_parent, m_id, m_title, wxPoint(m_x, m_y),
                 wxSize(m_w, m_h), m_style, m_name);
 
   frame->Create(m_parent, m_id, m_title, wxPoint(m_x, m_y),
                 wxSize(m_w, m_h), m_style, m_name);

-//  client->CreateClient(this, style_client);

 
   WXSERIAL(wxFrame)::LoadObject(s);
 }
 
   WXSERIAL(wxFrame)::LoadObject(s);
 }

+
+/////////////////////////////////////////////////////////////////////////////
+
+void WXSERIAL(wxMDIChildFrame)::StoreObject(wxObjectOutputStream& s)
+{
+  WXSERIAL(wxFrame)::StoreObject(s);
+}
+
+void WXSERIAL(wxMDIChildFrame)::LoadObject(wxObjectInputStream& s)
+{
+  WXSERIAL(wxFrame)::LoadObject(s);
+
+  if (s.SecondCall())
+    return;
+
+  ((wxMDIChildFrame *)Object())->Create((wxMDIParentFrame *)m_parent,
+                                        m_id, m_title,
+                                        wxPoint(m_x, m_y), wxSize(m_w, m_h),
+                                        m_style, m_name);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void WXSERIAL(wxMDIClientWindow)::StoreObject(wxObjectOutputStream& s)
+{
+  WXSERIAL(wxWindow)::StoreObject(s);
+}
+
+void WXSERIAL(wxMDIClientWindow)::LoadObject(wxObjectInputStream& s)
+{
+  WXSERIAL(wxWindow)::LoadObject(s);
+
+  if (s.SecondCall())
+    return;
+
+  ((wxMDIClientWindow *)Object())->CreateClient((wxMDIParentFrame *)m_parent, m_style);
+}