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

* Fixes and new features in wxObject*Stream

Browse Source 
* Fixes: wxChoice (GTK), wxCheckBox (GTK)
* Fixes: wxStream
* wxObject calls wx*Serialize::LoadObject/StoreObject in StoreObject/LoadObject
* Added support for dynamic library (Linux only, Windows will follow)
* Added serbase.h (Serialization base defines and base object)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1998-08-04 17:49:26 +00:00
parent 9fdd83842f
commit 7a4b9130e3
17 changed files with 833 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.in
View File

@@ -130,6 +130,8 @@ LIB_CPP_SRC=\
generic/tabg.cpp \
generic/textdlgg.cpp \
generic/treectrl.cpp
# common/dynlib.cpp Disabled until I write support for DLL on all platforms
LIB_C_SRC=\
common/extended.c \

228
src/common/dynlib.cpp Normal file
View File

@@ -0,0 +1,228 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dynlib.cpp
// Purpose: Dynamic library management
// Author: Guilhem Lavaux
// Modified by:
// Created: 20/07/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "dynlib.h"
#endif
#include <wx/dynlib.h>
#include <wx/filefn.h>
#include <wx/list.h>
#include <wx/string.h>
// ---------------------------------------------------------------------------
// System dependent include
// ---------------------------------------------------------------------------
#ifdef linux
#include <dlfcn.h>
#endif
// ---------------------------------------------------------------------------
// Global variables
// ---------------------------------------------------------------------------
wxLibraries wxTheLibraries;
// ---------------------------------------------------------------------------
// wxLibrary (one instance per dynamic library
// ---------------------------------------------------------------------------
wxLibrary::wxLibrary(void *handle)
{
typedef wxClassLibrary *(*t_get_list)(void);
t_get_list get_list;
m_handle = handle;
get_list = (t_get_list)GetSymbol("GetClassList");
m_liblist = (*get_list)();
}
wxLibrary::~wxLibrary()
{
if (m_handle) {
typedef void (*t_free_list)(wxClassLibrary *);
t_free_list free_list;
free_list = (t_free_list) GetSymbol("FreeClassList");
if (free_list != NULL)
free_list(m_liblist);
else
delete m_liblist;
dlclose(m_handle);
}
}
wxObject *wxLibrary::CreateObject(const wxString& name)
{
return m_liblist->CreateObject(name);
}
void *wxLibrary::GetSymbol(const wxString& symbname)
{
#ifdef linux
return dlsym(m_handle, symbname.GetData());
#endif
}
// ---------------------------------------------------------------------------
// wxLibraries (only one instance should normally exist)
// ---------------------------------------------------------------------------
wxLibraries::wxLibraries()
{
}
wxLibraries::~wxLibraries()
{
wxNode *node = m_loaded.First();
while (node) {
wxLibrary *lib = (wxLibrary *)node->Data();
delete lib;
node = node->Next();
}
}
wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
{
wxString lib_name = name;
wxNode *node;
wxLibrary *lib;
if ( (node = m_loaded.Find(name.GetData())) )
return ((wxLibrary *)node->Data());
#ifdef linux
lib_name.Prepend("./lib");
lib_name += ".so";
printf("lib_name = %s\n", WXSTRINGCAST lib_name);
void *handle = dlopen(lib_name.GetData(), RTLD_LAZY);
printf("handle = %x\n", handle);
lib = new wxLibrary(handle);
#endif
#ifdef __WINDOWS__
lib_name += ".dll";
#endif
m_loaded.Append(name.GetData(), lib);
return lib;
}
wxObject *wxLibraries::CreateObject(const wxString& path)
{
wxNode *node = m_loaded.First();
wxObject *obj;
while (node) {
obj = ((wxLibrary *)node->Data())->CreateObject(path);
if (obj)
return obj;
node = node->Next();
}
return NULL;
}
// ---------------------------------------------------------------------------
// wxClassLibrary (this class is used to access the internal class)
// ---------------------------------------------------------------------------
wxClassLibrary::wxClassLibrary(void)
{
}
wxClassLibrary::~wxClassLibrary(void)
{
uint i;
for (i=0;i<m_list.Count();i++)
delete (m_list[i]);
}
void wxClassLibrary::RegisterClass(wxClassInfo *class_info,
const wxString& path)
{
wxClassLibInfo *info = new wxClassLibInfo;
info->class_info = class_info;
info->path = path;
m_list.Add(info);
}
void wxClassLibrary::UnregisterClass(wxClassInfo *class_info)
{
uint i = 0;
while (i < m_list.Count()) {
if (m_list[i]->class_info == class_info) {
delete (m_list[i]);
m_list.Remove(i);
return;
}
i++;
}
}
bool wxClassLibrary::CreateObjects(const wxString& path,
wxArrayClassInfo& objs)
{
wxClassLibInfo *info;
uint i = 0;
while (i < m_list.Count()) {
info = m_list[i];
if (wxMatchWild(path, info->path))
objs.Add(info->class_info);
i++;
}
return (i > 0);
}
bool wxClassLibrary::FetchInfos(const wxString& path,
wxArrayClassLibInfo& infos)
{
wxClassLibInfo *info;
uint i = 0;
while (i < m_list.Count()) {
info = m_list[i];
if (wxMatchWild(path, info->path)) {
wxClassLibInfo *inf = new wxClassLibInfo;
*inf = *info;
infos.Add(inf);
}
i++;
}
return (i > 0);
}
wxObject *wxClassLibrary::CreateObject(const wxString& path)
{
wxClassLibInfo *info;
uint i = 0;
while (i < m_list.Count()) {
info = m_list[i];
if (wxMatchWild(path, info->path))
return info->class_info->CreateObject();
i++;
}
return NULL;
}

7
src/common/fstream.cpp
View File

@@ -23,8 +23,6 @@
#pragma hdrstop
#endif
#define BUF_TEMP_SIZE 10000
// ----------------------------------------------------------------------------
// wxFileInputStream
// ----------------------------------------------------------------------------
@@ -46,7 +44,10 @@ char wxFileInputStream::Peek()
size_t wxFileInputStream::DoRead(void *buffer, size_t size)
{
return wxFile::Read(buffer, size);
size_t ret = wxFile::Read(buffer, size);
m_eof = wxFile::Eof();
return ret;
}
off_t wxFileInputStream::DoSeekInput(off_t pos, wxSeekMode mode)

45
src/common/object.cpp
View File

@@ -221,12 +221,57 @@ wxObject *wxCreateDynamicObject(char *name)
#ifdef USE_STORABLE_CLASSES
#include "wx/serbase.h"
#include "wx/dynlib.h"
#include "wx/msgdlg.h"
wxObject* wxCreateStoredObject( wxInputStream &stream )
{
wxObjectInputStream obj_s(stream);
return obj_s.LoadObject();
};
void wxObject::StoreObject( wxObjectOutputStream& stream )
{
wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
WXSERIAL(wxObject) *serial =
(WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
if (!serial) {
wxString message;
message.Printf("Can't find the serialization object (%s) for the object %s",
WXSTRINGCAST obj_name, WXSTRINGCAST GetClassInfo()->GetClassName());
wxMessageBox(message, "Alert !");
return;
}
serial->SetObject(this);
serial->StoreObject(stream);
}
void wxObject::LoadObject( wxObjectInputStream& stream )
{
wxString obj_name = wxString(GetClassInfo()->GetClassName()) + "_Serialize";
wxLibrary *lib = wxTheLibraries.LoadLibrary("wxserial");
WXSERIAL(wxObject) *serial =
(WXSERIAL(wxObject) *)lib->CreateObject( obj_name );
if (!serial) {
wxString message;
message.Printf("Can't find the serialization object (%s) for the object %s",
WXSTRINGCAST obj_name,
WXSTRINGCAST GetClassInfo()->GetClassName());
wxMessageBox(message, "Alert !");
return;
}
serial->SetObject(this);
serial->LoadObject(stream);
}
#endif
/*

61
src/common/objstrm.cpp
View File

@@ -19,6 +19,8 @@
#define WXOBJ_BEGIN "OBEGIN"
#define WXOBJ_BEG_LEN 6
#define TAG_EMPTY_OBJECT "NULL"
// ----------------------------------------------------------------------------
// wxObjectOutputStream
// ----------------------------------------------------------------------------
@@ -42,8 +44,15 @@ void wxObjectOutputStream::WriteObjectDef(wxObjectStreamInfo& info)
wxDataOutputStream data_s(*this);
Write(WXOBJ_BEGIN, WXOBJ_BEG_LEN);
data_s.WriteString(info.object->GetClassInfo()->GetClassName());
if (info.object) {
data_s.WriteString(info.object->GetClassInfo()->GetClassName());
} else {
data_s.WriteString(TAG_EMPTY_OBJECT);
}
data_s.WriteString(GetObjectName(info.object));
// I assume an object will not have millions of children
data_s.Write8(info.children.Number());
}
@@ -58,7 +67,7 @@ void wxObjectOutputStream::AddChild(wxObject *obj)
info = new wxObjectStreamInfo;
info->n_children = 0;
info->object = obj;
info->parent = m_current_info->object; // Not useful here.
info->parent = m_current_info; // Not useful here.
m_current_info->n_children++;
m_current_info->children.Append(info);
}
@@ -69,7 +78,8 @@ void wxObjectOutputStream::ProcessObjectDef(wxObjectStreamInfo *info)
m_current_info = info;
// First stage: get children of obj
info->object->StoreObject(*this);
if (info->object)
info->object->StoreObject(*this);
// Prepare and write the sub-entry about the child obj.
WriteObjectDef(*info);
@@ -88,7 +98,8 @@ void wxObjectOutputStream::ProcessObjectData(wxObjectStreamInfo *info)
m_current_info = info;
info->object->StoreObject(*this);
if (info->object)
info->object->StoreObject(*this);
while (node) {
ProcessObjectData((wxObjectStreamInfo *)node->Data());
@@ -145,24 +156,54 @@ wxObject *wxObjectInputStream::SolveName(const wxString& name) const
return NULL;
}
wxObject *wxObjectInputStream::GetParent() const
{
if (!m_current_info->parent)
return NULL;
return m_current_info->parent->object;
}
wxObject *wxObjectInputStream::GetChild(int no) const
{
return m_current_info->children.Nth(no);
wxNode *node = m_current_info->children.Nth(m_current_info->children_removed+no);
wxObjectStreamInfo *info;
if (!node)
return NULL;
info = (wxObjectStreamInfo *)node->Data();
return info->object;
}
void wxObjectInputStream::RemoveChildren(int nb)
{
m_current_info->children_removed += nb;
}
bool wxObjectInputStream::ReadObjectDef(wxObjectStreamInfo *info)
{
wxDataInputStream data_s(*this);
char sig[WXOBJ_BEG_LEN+1];
wxString class_name;
Read(sig, WXOBJ_BEG_LEN);
sig[WXOBJ_BEG_LEN] = 0;
if (wxString(sig) != WXOBJ_BEGIN)
return FALSE;
info->object = wxCreateDynamicObject( WXSTRINGCAST data_s.ReadString());
class_name = data_s.ReadString();
printf("class_name = %s\n", WXSTRINGCAST class_name);
if (class_name == TAG_EMPTY_OBJECT)
info->object = NULL;
else
info->object = wxCreateDynamicObject( WXSTRINGCAST class_name);
info->object_name = data_s.ReadString();
printf("object_name = %s\n", WXSTRINGCAST info->object_name);
info->n_children = data_s.Read8();
info->children = wxList();
info->children_removed = 0;
printf("n_children = %d\n", info->n_children);
return TRUE;
}
@@ -198,10 +239,10 @@ void wxObjectInputStream::ProcessObjectData(wxObjectStreamInfo *info)
m_current_info = info;
info->object->LoadObject(*this);
if (info->object)
info->object->LoadObject(*this);
while (node) {
c_info = (wxObjectStreamInfo *)node->Data();
c_info->object->LoadObject(*this);
ProcessObjectData((wxObjectStreamInfo *)node->Data());
node = node->Next();
}
}

2
src/common/stream.cpp
View File

@@ -202,12 +202,14 @@ wxInputStream::wxInputStream()
{
m_i_destroybuf = TRUE;
m_i_streambuf = new wxStreamBuffer(*this);
m_eof = FALSE;
}
wxInputStream::wxInputStream(wxStreamBuffer *buffer)
{
m_i_destroybuf = FALSE;
m_i_streambuf = buffer;
m_eof = FALSE;
}
wxInputStream::~wxInputStream()

2
src/gtk/checkbox.cpp
View File

@@ -59,6 +59,8 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
PreCreation( parent, id, pos, size, style, name );
SetLabel( label );
m_widget = gtk_check_button_new_with_label( label );
wxSize newSize = size;

4
src/gtk/choice.cpp
View File

@@ -179,9 +179,9 @@ wxString wxChoice::GetStringSelection(void) const
int wxChoice::Number(void) const
{
GtkMenu *menu = GTK_MENU( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
GList *child = menu->children;
GList *child = menu_shell->children;
while (child)
{
count++;

2
src/gtk1/checkbox.cpp
View File

@@ -59,6 +59,8 @@ bool wxCheckBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
PreCreation( parent, id, pos, size, style, name );
SetLabel( label );
m_widget = gtk_check_button_new_with_label( label );
wxSize newSize = size;

4
src/gtk1/choice.cpp
View File

@@ -179,9 +179,9 @@ wxString wxChoice::GetStringSelection(void) const
int wxChoice::Number(void) const
{
GtkMenu *menu = GTK_MENU( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
GList *child = menu->children;
GList *child = menu_shell->children;
while (child)
{
count++;