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

Removed Persistance Framework code/files from FrameLayout

Browse Source 
Corrected makefiles to match


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth
1999-04-05 23:55:42 +00:00
parent c4b10e41c7
commit 21677c36c9
19 changed files with 44 additions and 3783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
utils/framelayout/samples/sample/fl_sample.cpp
View File

@@ -26,7 +26,6 @@
#endif
#include "controlbar.h"
#include "objstore.h"
// plugins used
#include "barhintspl.h"
@@ -58,7 +57,6 @@ protected:
wxWindow* mpClientWnd;
wxPanel* mpInternalFrm;
void SerializeMe( wxObjectStorage& store );
wxTextCtrl* CreateTextCtrl( const wxString& value );
@@ -67,8 +65,6 @@ public:
MyFrame( wxWindow* parent, char *title );
~MyFrame();
void OnLoad( wxCommandEvent& event );
void OnStore( wxCommandEvent& event );
void OnQuit( wxCommandEvent& event );
bool OnClose(void) { return TRUE; }
@@ -112,8 +108,6 @@ bool MyApp::OnInit(void)
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU( ID_LOAD, MyFrame::OnLoad )
EVT_MENU( ID_STORE, MyFrame::OnStore )
EVT_MENU( ID_QUIT, MyFrame::OnQuit )
END_EVENT_TABLE()
@@ -204,46 +198,6 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
return pCtrl;
}
void MyFrame::OnLoad( wxCommandEvent& event )
{
if ( !wxFileExists( LAYOUT_FILE ) )
{
wxMessageBox( "layout data file `layout.dat' not found\n\n store layout first" );
return;
}
mpLayout->HideBarWindows(); // hide first, to avoid flickered destruction
mpLayout->DestroyBarWindows();
if ( mpClientWnd )
{
mpClientWnd->Destroy();
delete mpLayout;
mpClientWnd = NULL;
}
wxIOStreamWrapper stm;
stm.CreateForInput( LAYOUT_FILE ); // TRUE - create stream for input
wxObjectStorage store( stm );
SerializeMe( store );
mpLayout->Activate();
}
void MyFrame::OnStore( wxCommandEvent& event )
{
wxIOStreamWrapper stm;
stm.CreateForOutput( LAYOUT_FILE ); // FALSE - create stream for output
wxObjectStorage store( stm );
SerializeMe( store );
}
void MyFrame::OnQuit( wxCommandEvent& event )
{
Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
@@ -251,21 +205,6 @@ void MyFrame::OnQuit( wxCommandEvent& event )
Close(TRUE);
}
void MyFrame::SerializeMe( wxObjectStorage& store )
{
// mark contaienr-frames as not serializable
store.AddInitialRef( mpInternalFrm );
store.AddInitialRef( this );
// does all the rest for as
store.XchgObjPtr( (wxObject**) &(mpLayout) );
store.XchgObjPtr( (wxObject**) &(mpClientWnd) );
store.Finalize(); // finish serialization
}
#ifdef __HACK_MY_MSDEV40__
////////////// new 2.0-magic (linker errors...) ////////////////