packages feed

wxcore 0.10.12 → 0.10.13

raw patch · 9 files changed

+1239/−14 lines, 9 files

Files

configure view
@@ -12,7 +12,7 @@ #-------------------------------------------------------------------- # Versioning #---------------------------------------------------------------------version="0.10.12"+version="0.10.13" release="0"  #--------------------------------------------------------------------
wxc/src/eljrc.cpp view
@@ -488,13 +488,19 @@ 
 EWXWEXPORT(int,wxXmlResource_GetDomain)(wxXmlResource* _obj, wxChar* buf)
 {
+#if wxCHECK_VERSION (2,8,0)
 	buf = _obj->GetDomain();
 	return wxStrlen(buf);
+#else
+	return (int) false;
+#endif
 }
 
 EWXWEXPORT(void,wxXmlResource_SetDomain)(wxXmlResource* _obj, wxString* domain)
 {
+#if wxCHECK_VERSION (2,8,0)
 	_obj->SetDomain(*domain);
+#endif
 }
 
 EWXWEXPORT(int,wxXmlResource_GetFlags)(wxXmlResource* _obj)
+ wxc/src/eljrc.cpp.1~ view
@@ -0,0 +1,510 @@+#include "wrapper.h"
+#include <wx/xrc/xmlres.h>
+
+#ifdef wxUSE_STC
+# include "wx/stc/stc.h"
+#endif
+
+class wxMDIParentFrameXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxMDIParentFrameXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+class wxMDIChildFrameXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxMDIChildFrameXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+class wxSplitterWindowXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxSplitterWindowXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+#ifdef wxUSE_STC
+class wxStyledTextCtrlXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxStyledTextCtrlXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+#endif
+
+class wxGridXmlHandler : public wxXmlResourceHandler
+{
+public:
+    wxGridXmlHandler();
+    virtual wxObject *DoCreateResource();
+    virtual bool CanHandle(wxXmlNode *node);
+};
+
+wxMDIParentFrameXmlHandler::wxMDIParentFrameXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
+    XRC_ADD_STYLE(wxSYSTEM_MENU);
+    XRC_ADD_STYLE(wxRESIZE_BORDER);
+
+    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
+    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxMDIParentFrameXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxMDIParentFrame);
+
+    frame->Create(m_parentAsWindow,
+                  GetID(),
+                  GetText(wxT("title")),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
+                  GetName());
+
+    if (HasParam(wxT("size")))
+        frame->SetClientSize(GetSize());
+    if (HasParam(wxT("pos")))
+        frame->Move(GetPosition());
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+
+    if (GetBool(wxT("centered"), FALSE))
+        frame->Centre();
+
+    return frame;
+}
+
+bool wxMDIParentFrameXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxMDIParentFrame"));
+}
+
+wxMDIChildFrameXmlHandler::wxMDIChildFrameXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+    XRC_ADD_STYLE(wxCAPTION);
+    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
+    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
+    XRC_ADD_STYLE(wxSYSTEM_MENU);
+    XRC_ADD_STYLE(wxRESIZE_BORDER);
+
+    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
+    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
+    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
+    XRC_ADD_STYLE(wxMINIMIZE_BOX);
+    XRC_ADD_STYLE(wxSTAY_ON_TOP);
+
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxMDIChildFrameXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
+	
+	wxMDIParentFrame* prt = wxDynamicCast (m_parentAsWindow, wxMDIParentFrame);
+
+	if (prt == NULL)
+	{
+		wxLogError(wxT("Error in resource: wxMDIChildFrame has no wxMDIParentFrame."));
+		return NULL;
+	}
+
+    frame->Create(prt,
+                  GetID(),
+                  GetText(wxT("title")),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
+                  GetName());
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+
+    if (GetBool(wxT("centered"), FALSE))
+        frame->Centre();
+
+    return frame;
+}
+
+bool wxMDIChildFrameXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxMDIChildFrame"));
+}
+
+wxSplitterWindowXmlHandler::wxSplitterWindowXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxSP_3D);
+    XRC_ADD_STYLE(wxSP_3DSASH);
+    XRC_ADD_STYLE(wxSP_BORDER);
+    XRC_ADD_STYLE(wxSP_NOBORDER);
+    XRC_ADD_STYLE(wxSP_PERMIT_UNSPLIT);
+    XRC_ADD_STYLE(wxSP_LIVE_UPDATE);
+
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxSplitterWindowXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxSplitterWindow);
+
+    frame->Create(m_parentAsWindow,
+                  GetID(),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), wxSP_3D),
+                  GetName());
+
+    SetupWindow(frame);
+
+    CreateChildren(frame);
+	
+	if (frame->GetChildren().GetCount() != 2)
+	{
+		wxLogError(wxT("Error in resource: Splitter window needs exactly two children."));
+		return NULL;
+	}
+	
+	frame->SetSplitMode(GetLong (wxT("splitmode"), wxSPLIT_VERTICAL));
+	long sashpos = GetLong (wxT("sashposition"), 100);
+	
+	wxWindowList::compatibility_iterator node = frame->GetChildren().GetFirst();
+	wxWindow* wnd1 = node->GetData();
+	wxWindow* wnd2 = node->GetNext()->GetData();
+
+	if (frame->GetSplitMode() == wxSPLIT_VERTICAL)
+		frame->SplitVertically (wnd1, wnd2, sashpos);
+	else
+		frame->SplitHorizontally (wnd1, wnd2, sashpos);
+	
+    return frame;
+}
+
+bool wxSplitterWindowXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxSplitterWindow"));
+}
+
+#ifdef wxUSE_STC
+wxStyledTextCtrlXmlHandler::wxStyledTextCtrlXmlHandler() : wxXmlResourceHandler()
+{
+    AddWindowStyles();
+}
+
+wxObject *wxStyledTextCtrlXmlHandler::DoCreateResource()
+{
+    XRC_MAKE_INSTANCE(frame, wxStyledTextCtrl);
+	
+    frame->Create(m_parentAsWindow,
+                  GetID(),
+                  wxDefaultPosition, wxDefaultSize,
+                  GetStyle(wxT("style"), 0),
+                  GetName());
+
+    if (HasParam(wxT("size")))
+        frame->SetSize(GetSize());
+    if (HasParam(wxT("pos")))
+        frame->Move(GetPosition());
+
+    SetupWindow(frame);
+
+    return frame;
+}
+
+bool wxStyledTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxStyledTextCtrl"));
+}
+#endif
+
+wxGridXmlHandler::wxGridXmlHandler() : wxXmlResourceHandler()
+{
+    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
+    XRC_ADD_STYLE(wxCLIP_CHILDREN);
+
+    AddWindowStyles();
+}
+
+wxObject *wxGridXmlHandler::DoCreateResource()
+{
+	wxGrid* grid = new wxGrid(m_parentAsWindow,
+                              GetID(),
+                              wxDefaultPosition, wxDefaultSize,
+                              GetStyle(wxT("style"), wxWANTS_CHARS),
+                              GetName());
+
+	long cols = GetLong (wxT("numcols"), 0);
+	long rows = GetLong (wxT("numrows"), 0);
+	
+	if (cols && rows)
+		grid->CreateGrid(cols, rows, (wxGrid::wxGridSelectionModes)GetLong (wxT("selmode"), 0));
+	
+    if (HasParam(wxT("size")))
+        grid->SetSize(GetSize());
+    if (HasParam(wxT("pos")))
+        grid->Move(GetPosition());
+
+	SetupWindow(grid);
+
+	return grid;
+}
+
+bool wxGridXmlHandler::CanHandle(wxXmlNode *node)
+{
+    return IsOfClass(node, wxT("wxGrid"));
+}
+
+extern "C"
+{
+
+EWXWEXPORT(bool,wxXmlResource_Load)(wxXmlResource* _obj, wxString* filemask)
+{
+	wxGetApp().InitZipFileSystem();
+	return _obj->Load(*filemask);
+}
+	
+EWXWEXPORT(void,wxXmlResource_InitAllHandlers)(wxXmlResource* _obj)
+{
+	_obj->InitAllHandlers();
+	_obj->AddHandler(new wxMDIParentFrameXmlHandler());
+	_obj->AddHandler(new wxMDIChildFrameXmlHandler());
+	_obj->AddHandler(new wxSplitterWindowXmlHandler());
+#ifdef wxUSE_STC
+	_obj->AddHandler(new wxStyledTextCtrlXmlHandler());
+#endif
+	_obj->AddHandler(new wxGridXmlHandler());
+}
+	
+EWXWEXPORT(wxXmlResource*, wxXmlResource_Create)(int flags)
+{
+	wxXmlResource* _obj = wxXmlResource::Get();
+
+	// Calling the wxc variant of InitAllHandlers() ensures additional
+	// handlers for splitters etc. get initialized as well.
+	wxXmlResource_InitAllHandlers(_obj);
+	_obj->SetFlags(flags);
+	return _obj;
+}
+	
+EWXWEXPORT(wxXmlResource*, wxXmlResource_CreateFromFile)(wxString* filemask, int flags)
+{
+	wxXmlResource* _obj = wxXmlResource_Create(flags);
+    if (_obj->Load(*filemask)) {
+		return _obj;
+    }
+	else {
+		delete _obj;
+		return NULL;
+	}
+}
+	
+EWXWEXPORT(void,wxXmlResource_AddHandler)(wxXmlResource* _obj, wxXmlResourceHandler* handler)
+{
+	_obj->AddHandler(handler);
+}
+	
+EWXWEXPORT(void,wxXmlResource_InsertHandler)(wxXmlResource* _obj, wxXmlResourceHandler* handler)
+{
+	_obj->InsertHandler(handler);
+}
+	
+EWXWEXPORT(void,wxXmlResource_ClearHandlers)(wxXmlResource* _obj)
+{
+	_obj->ClearHandlers();
+}
+	
+EWXWEXPORT(void,wxXmlResource_AddSubclassFactory)(wxXmlResource* _obj, wxXmlSubclassFactory* factory)
+{
+	_obj->AddSubclassFactory(factory);
+}
+
+EWXWEXPORT(wxMenu*,wxXmlResource_LoadMenu)(wxXmlResource* _obj, wxString* name)
+{
+	return _obj->LoadMenu(*name);
+}
+	
+EWXWEXPORT(wxMenuBar*,wxXmlResource_LoadMenuBar)(wxXmlResource* _obj, wxWindow* parent, wxString* name)
+{
+	return _obj->LoadMenuBar(parent, *name);
+}
+	
+EWXWEXPORT(wxToolBar*,wxXmlResource_LoadToolBar)(wxXmlResource* _obj, wxWindow* parent, wxString* name)
+{
+	return _obj->LoadToolBar(parent, *name);
+}
+	
+EWXWEXPORT(wxDialog*,wxXmlResource_LoadDialog)(wxXmlResource* _obj, wxWindow* parent, wxString* name)
+{
+    wxDialog* dlg = new wxDialog;
+    if (!_obj->LoadDialog(dlg, parent, *name)) {
+        delete dlg;
+        return NULL;
+    } else {
+        return dlg;
+    }
+}
+	
+EWXWEXPORT(wxPanel*,wxXmlResource_LoadPanel)(wxXmlResource* _obj, wxWindow* parent, wxString* name)
+{
+	return _obj->LoadPanel(parent, *name);
+}
+	
+EWXWEXPORT(wxFrame*,wxXmlResource_LoadFrame)(wxXmlResource* _obj, wxWindow* parent, wxString* name)
+{
+    wxFrame* frame = new wxFrame;
+    if (!_obj->LoadFrame(frame, parent, *name)) {
+        delete frame;
+        return NULL;
+    } else {
+        return frame;
+    }
+}
+	
+EWXWEXPORT(void,wxXmlResource_LoadBitmap)(wxXmlResource* _obj, wxString* name, void* _ref)
+{
+	*((wxBitmap*)_ref) = _obj->LoadBitmap(*name);
+}
+	
+EWXWEXPORT(void,wxXmlResource_LoadIcon)(wxXmlResource* _obj, wxString* name, void* _ref)
+{
+	*((wxIcon*)_ref) = _obj->LoadIcon(*name);
+}
+	
+EWXWEXPORT(bool,wxXmlResource_Unload)(wxXmlResource* _obj, wxString* name)
+{
+	return _obj->Unload(*name);
+}
+	
+EWXWEXPORT(bool,wxXmlResource_AttachUnknownControl)(wxXmlResource* _obj, wxString* name, wxWindow* control, wxWindow* parent)
+{
+	return _obj->AttachUnknownControl(*name, control, parent);
+}
+	
+EWXWEXPORT(int,wxXmlResource_GetXRCID)(wxXmlResource* _obj, wxString* str_id)
+{
+	return _obj->GetXRCID(*str_id);
+}
+	
+EWXWEXPORT(long,wxXmlResource_GetVersion)(wxXmlResource* _obj)
+{
+	return _obj->GetVersion();
+}
+	
+EWXWEXPORT(int,wxXmlResource_CompareVersion)(wxXmlResource* _obj, int major, int minor, int release, int revision)
+{
+	return _obj->CompareVersion(major, minor, release, revision);
+}
+	
+EWXWEXPORT(wxXmlResource*,wxXmlResource_Get)(wxXmlResource* _obj)
+{
+  return wxXmlResource::Get();
+}
+
+// BUILD_XRCGETCTRL_FN constructs functions for geting control pointers out of 
+// window hierarchies created from XRC files. The functions themselves 
+#define BUILD_XRCGETCTRL_FN(_typ)                                                            \
+  EWXWEXPORT(wx##_typ *, wxXmlResource_Get##_typ)(wxWindow* _win, wxString* _str_id)          \
+  {                                                                                          \
+  return reinterpret_cast<wx##_typ *>(_win->FindWindow(wxXmlResource::GetXRCID(*_str_id))); \
+  }
+// Construct the XRC control getter functions
+BUILD_XRCGETCTRL_FN(Sizer)
+BUILD_XRCGETCTRL_FN(BoxSizer)
+BUILD_XRCGETCTRL_FN(StaticBoxSizer)
+BUILD_XRCGETCTRL_FN(GridSizer)
+BUILD_XRCGETCTRL_FN(FlexGridSizer)
+BUILD_XRCGETCTRL_FN(BitmapButton)
+BUILD_XRCGETCTRL_FN(Button)
+BUILD_XRCGETCTRL_FN(CalendarCtrl)
+BUILD_XRCGETCTRL_FN(CheckBox)
+BUILD_XRCGETCTRL_FN(CheckListBox)
+BUILD_XRCGETCTRL_FN(Choice)
+BUILD_XRCGETCTRL_FN(ComboBox)
+BUILD_XRCGETCTRL_FN(Gauge)
+BUILD_XRCGETCTRL_FN(Grid)
+BUILD_XRCGETCTRL_FN(HtmlWindow)
+BUILD_XRCGETCTRL_FN(ListBox)
+BUILD_XRCGETCTRL_FN(ListCtrl)
+BUILD_XRCGETCTRL_FN(MDIChildFrame)
+BUILD_XRCGETCTRL_FN(MDIParentFrame)
+BUILD_XRCGETCTRL_FN(Menu)
+BUILD_XRCGETCTRL_FN(MenuBar)
+BUILD_XRCGETCTRL_FN(MenuItem)
+BUILD_XRCGETCTRL_FN(Notebook)
+BUILD_XRCGETCTRL_FN(Panel)
+BUILD_XRCGETCTRL_FN(RadioButton)
+BUILD_XRCGETCTRL_FN(RadioBox)
+BUILD_XRCGETCTRL_FN(ScrollBar)
+BUILD_XRCGETCTRL_FN(ScrolledWindow)
+BUILD_XRCGETCTRL_FN(Slider)
+BUILD_XRCGETCTRL_FN(SpinButton)
+BUILD_XRCGETCTRL_FN(SpinCtrl)
+BUILD_XRCGETCTRL_FN(SplitterWindow)
+#ifdef wxUSE_STC
+BUILD_XRCGETCTRL_FN(StyledTextCtrl)
+#else
+EWXWEXPORT(void*, wxXmlResource_GetStyledTextCtrl)(wxWindow* _win, wxString* _str_id)
+{
+  return NULL;
+}
+#endif
+BUILD_XRCGETCTRL_FN(StaticBitmap)
+BUILD_XRCGETCTRL_FN(StaticBox)
+BUILD_XRCGETCTRL_FN(StaticLine)
+BUILD_XRCGETCTRL_FN(StaticText)
+BUILD_XRCGETCTRL_FN(TextCtrl)
+BUILD_XRCGETCTRL_FN(TreeCtrl)
+	
+EWXWEXPORT(wxXmlResource*,wxXmlResource_Set)(wxXmlResource* _obj, wxXmlResource* res)
+{
+	return _obj->Set(res);
+}
+
+EWXWEXPORT(int,wxXmlResource_GetDomain)(wxXmlResource* _obj, wxChar* buf)
+{
+	buf = _obj->GetDomain();
+	return wxStrlen(buf);
+}
+
+EWXWEXPORT(void,wxXmlResource_SetDomain)(wxXmlResource* _obj, wxString* domain)
+{
+	_obj->SetDomain(*domain);
+}
+
+EWXWEXPORT(int,wxXmlResource_GetFlags)(wxXmlResource* _obj)
+{
+	return _obj->GetFlags();
+}
+	
+EWXWEXPORT(void,wxXmlResource_SetFlags)(wxXmlResource* _obj, int flags)
+{
+	_obj->SetFlags(flags);
+}
+	
+}
wxc/src/eljsizer.cpp view
@@ -395,7 +395,11 @@ 
 EWXWEXPORT(void *, wxSizer_GetContainingWindow)(void* _obj)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (void *)((wxSizer*)_obj)->GetContainingWindow();
+#else
+  return NULL;
+#endif
 }
 
 EWXWEXPORT(void *, wxSizer_GetItemWindow)(void* _obj, void *window, int recursive)
@@ -415,17 +419,29 @@ 
 EWXWEXPORT(int, wxSizer_HideWindow)(void* _obj, void *window)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->Hide((wxWindow*) window);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(int, wxSizer_HideSizer)(void* _obj, void *sizer)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->Hide((wxSizer*) sizer);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(int, wxSizer_Hide)(void* _obj, int index)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->Hide((size_t) index);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(void *, wxSizer_InsertSpacer)(void* _obj, int index, int size)
@@ -440,17 +456,29 @@ 
 EWXWEXPORT(int, wxSizer_IsShownWindow)(void* _obj, void *window)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->IsShown((wxWindow*) window);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(int, wxSizer_IsShownSizer)(void* _obj, void *sizer)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->IsShown((wxSizer*) sizer);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(int, wxSizer_IsShown)(void* _obj, int index)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->IsShown((size_t) index);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(void *, wxSizer_PrependSpacer)(void* _obj, int size)
@@ -465,17 +493,29 @@ 
 EWXWEXPORT(int, wxSizer_ReplaceWindow)(void* _obj, void *oldwin, void *newwin, int recursive)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->Replace((wxWindow*) oldwin, (wxWindow*) newwin, (bool) recursive);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(int, wxSizer_ReplaceSizer)(void* _obj, void *oldsz, void *newsz, int recursive)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->Replace((wxSizer*) oldsz, (wxSizer*) newsz, (bool) recursive);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(int, wxSizer_Replace)(void* _obj, int oldindex, void *newsz)
 {
+#if wxCHECK_VERSION (2,8,0)
   return (int)((wxSizer*)_obj)->Replace((size_t) oldindex, (wxSizerItem*) newsz);
+#else
+  return (int) false;
+#endif
 }
 
 EWXWEXPORT(void, wxSizer_SetVirtualSizeHints)(void* _obj, void *window)
+ wxc/src/eljsizer.cpp.1~ view
@@ -0,0 +1,669 @@+#include "wrapper.h"
+
+extern "C"
+{
+
+EWXWEXPORT(void*, wxSizerItem_Create)(int width, int height, int option, int flag, int border, void* userData)
+{
+	return (void*) new wxSizerItem(width, height, option, flag, border, new ELJDataObject(userData));
+}
+	
+EWXWEXPORT(void*, wxSizerItem_CreateInWindow)(void* window, int option, int flag, int border, void* userData )
+{
+	return (void*) new wxSizerItem((wxWindow*)window, option, flag, border, new ELJDataObject(userData));
+}
+	
+EWXWEXPORT(void*, wxSizerItem_CreateInSizer)(void* sizer, int option, int flag, int border, void* userData )
+{
+	return (void*) new wxSizerItem((wxSizer*) sizer, option, flag, border, new ELJDataObject(userData));
+}
+	
+EWXWEXPORT(void, wxSizerItem_GetSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizerItem*)_obj)->GetSize();
+	(*(int*)_h) = res.GetHeight();
+	(*(int*)_w) = res.GetWidth();
+}
+	
+EWXWEXPORT(void, wxSizerItem_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizerItem*)_obj)->CalcMin();
+	(*(int*)_h) = res.GetHeight();
+	(*(int*)_w) = res.GetWidth();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetDimension)(void* _obj,  int _x, int _y, int _w, int _h)
+{
+	((wxSizerItem*)_obj)->SetDimension(wxPoint(_x, _y), wxSize(_w, _h));
+}
+	
+EWXWEXPORT(void, wxSizerItem_GetMinSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizerItem*)_obj)->GetMinSize();
+	(*(int*)_h) = res.GetHeight();
+	(*(int*)_w) = res.GetWidth();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetRatio)(void* _obj,  int width, int height)
+{
+	((wxSizerItem*)_obj)->SetRatio(width, height);
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetFloatRatio)(void* _obj,  float ratio)
+{
+	((wxSizerItem*)_obj)->SetRatio(ratio);
+}
+	
+EWXWEXPORT(float, wxSizerItem_GetRatio)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetRatio();
+}
+	
+EWXWEXPORT(int, wxSizerItem_IsWindow)(void* _obj)
+{
+	return (int)((wxSizerItem*)_obj)->IsWindow();
+}
+	
+EWXWEXPORT(int, wxSizerItem_IsSizer)(void* _obj)
+{
+	return (int)((wxSizerItem*)_obj)->IsSizer();
+}
+	
+EWXWEXPORT(int, wxSizerItem_IsSpacer)(void* _obj)
+{
+	return (int)((wxSizerItem*)_obj)->IsSpacer();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetInitSize)(void* _obj, int x, int y)
+{
+	((wxSizerItem*)_obj)->SetInitSize(x, y);
+}
+	
+#if (wxVERSION_NUMBER < 2800)	
+EWXWEXPORT(void, wxSizerItem_SetOption)(void* _obj, int option)
+{
+	((wxSizerItem*)_obj)->SetOption(option);
+}
+#endif
+
+EWXWEXPORT(void, wxSizerItem_SetFlag)(void* _obj, int flag)
+{
+	((wxSizerItem*)_obj)->SetFlag(flag);
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetBorder)(void* _obj, int border)
+{
+	((wxSizerItem*)_obj)->SetBorder(border);
+}
+	
+EWXWEXPORT(void*, wxSizerItem_GetWindow)(void* _obj)
+{
+	return (void*)((wxSizerItem*)_obj)->GetWindow();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetWindow)(void* _obj, void* window)
+{
+	((wxSizerItem*)_obj)->SetWindow((wxWindow*) window);
+}
+	
+EWXWEXPORT(void*, wxSizerItem_GetSizer)(void* _obj)
+{
+	return (void*)((wxSizerItem*)_obj)->GetSizer();
+}
+	
+EWXWEXPORT(void, wxSizerItem_SetSizer)(void* _obj, void* sizer)
+{
+	((wxSizerItem*)_obj)->SetSizer((wxSizer*) sizer);
+}
+	
+#if (wxVERSION_NUMBER < 2800)
+EWXWEXPORT(int, wxSizerItem_GetOption)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetOption();
+}
+#endif
+
+EWXWEXPORT(int, wxSizerItem_GetFlag)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetFlag();
+}
+	
+EWXWEXPORT(int, wxSizerItem_GetBorder)(void* _obj)
+{
+	return ((wxSizerItem*)_obj)->GetBorder();
+}
+	
+EWXWEXPORT(void*, wxSizerItem_GetUserData)(void* _obj)
+{
+	return ((ELJDataObject*)((wxSizerItem*)_obj)->GetUserData())->data;
+}
+	
+EWXWEXPORT(void, wxSizerItem_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint res = ((wxSizerItem*)_obj)->GetPosition();
+	(*(int*)_x) = res.x;
+	(*(int*)_y) = res.y;
+}
+	
+#if (wxVERSION_NUMBER >= 2800)
+EWXWEXPORT(void, wxSizerItem_Delete)(void* _obj)
+{
+  delete ((wxSizerItem*)_obj);
+}
+
+EWXWEXPORT(void, wxSizerItem_DeleteWindows)(void *_obj)
+{
+  ((wxSizerItem*)_obj)->DeleteWindows();
+}
+
+EWXWEXPORT(void, wxSizerItem_DetachSizer)(void *_obj)
+{
+  ((wxSizerItem*)_obj)->DetachSizer();
+}
+
+EWXWEXPORT(int, wxSizerItem_GetProportion)(void *_obj)
+{
+  return ((wxSizerItem*)_obj)->GetProportion();
+}
+
+EWXWEXPORT(void, wxSizerItem_GetRect)(void *_obj, void *_x, void *_y, void *_w, void *_h)
+{
+  wxRect r = ((wxSizerItem*)_obj)->GetRect();
+
+  (*(int *)_x) = r.GetX();
+  (*(int *)_y) = r.GetY();
+  (*(int *)_w) = r.GetWidth();
+  (*(int *)_h) = r.GetHeight();
+}
+
+EWXWEXPORT(void, wxSizerItem_GetSpacer)(void *_obj, void *_w, void *_h)
+{
+  wxSize sz(0,0);
+
+  if (((wxSizerItem*)_obj)->IsSpacer())
+  {
+    sz = ((wxSizerItem*)_obj)->GetSpacer();
+  }
+  (*(int *)_w) = sz.GetWidth();
+  (*(int *)_h) = sz.GetHeight();
+}
+
+EWXWEXPORT(int, wxSizerItem_IsShown)(void *_obj)
+{
+  return (int) ((wxSizerItem*)_obj)->IsShown();
+}
+
+EWXWEXPORT(void, wxSizerItem_SetProportion)(void *_obj, int proportion)
+{
+  ((wxSizerItem*)_obj)->SetProportion(proportion);
+}
+
+EWXWEXPORT(void, wxSizerItem_SetSpacer)(void *_obj, int width, int height)
+{
+  ((wxSizerItem*)_obj)->SetSpacer(wxSize(width, height));
+}
+
+EWXWEXPORT(void, wxSizerItem_Show)(void *_obj, int show)
+{
+  ((wxSizerItem*)_obj)->Show(show);
+}
+#endif
+
+EWXWEXPORT(void, wxSizer_AddWindow)(void* _obj, void* window, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Add((wxWindow*)window, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_AddSizer)(void* _obj, void* sizer, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Add((wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_Add)(void* _obj, int width, int height, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Add(width, height, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_InsertWindow)(void* _obj, int before, void* window, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Insert(before, (wxWindow*)window, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_InsertSizer)(void* _obj, int before, void* sizer, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Insert(before, (wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_Insert)(void* _obj, int before, int width, int height, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Insert(before, width, height, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_PrependWindow)(void* _obj, void* window, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Prepend((wxWindow*)window, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_PrependSizer)(void* _obj, void* sizer, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Prepend((wxSizer*)sizer, option, flag, border, new ELJDataObject (userData));
+}
+	
+EWXWEXPORT(void, wxSizer_Prepend)(void* _obj, int width, int height, int option, int flag, int border, void* userData)
+{
+	((wxSizer*)_obj)->Prepend(width, height, option, flag, border, new ELJDataObject (userData));
+}
+	
+#if (wxVERSION_NUMBER < 2800)	
+EWXWEXPORT(int, wxSizer_RemoveWindow)(void* _obj, void* window)
+{
+	return (int)((wxSizer*)_obj)->Remove((wxWindow*) window);
+}
+	
+EWXWEXPORT(int, wxSizer_RemoveSizer)(void* _obj, void* sizer)
+{
+	return (int)((wxSizer*)_obj)->Remove((wxSizer*) sizer);
+}
+	
+EWXWEXPORT(int, wxSizer_Remove)(void* _obj, int pos)
+{
+	return (int)((wxSizer*)_obj)->Remove(pos);
+}
+#endif
+	
+EWXWEXPORT(void, wxSizer_SetMinSize)(void* _obj, int width, int height)
+{
+	((wxSizer*)_obj)->SetMinSize(width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_SetItemMinSizeWindow)(void* _obj, void* window, int width, int height)
+{
+	((wxSizer*)_obj)->SetItemMinSize((wxWindow*) window, width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_SetItemMinSizeSizer)(void* _obj, void* sizer, int width, int height)
+{
+	((wxSizer*)_obj)->SetItemMinSize((wxSizer*) sizer, width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_SetItemMinSize)(void* _obj, int pos, int width, int height )
+{
+	((wxSizer*)_obj)->SetItemMinSize(pos, width, height);
+}
+	
+EWXWEXPORT(void, wxSizer_GetSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizer*)_obj)->GetSize();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxSizer_GetPosition)(void* _obj, void* _x, void* _y)
+{
+	wxPoint res = ((wxSizer*)_obj)->GetPosition();
+	(*(int*)_x) = res.x;
+	(*(int*)_y) = res.y;
+}
+	
+EWXWEXPORT(void, wxSizer_GetMinSize)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizer*)_obj)->GetMinSize();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxSizer_RecalcSizes)(void* _obj)
+{
+	((wxSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxSizer_Layout)(void* _obj)
+{
+	((wxSizer*)_obj)->Layout();
+}
+	
+EWXWEXPORT(void, wxSizer_Fit)(void* _obj, void* window )
+{
+	((wxSizer*)_obj)->Fit((wxWindow*) window);
+}
+	
+EWXWEXPORT(void, wxSizer_SetSizeHints)(void* _obj, void* window )
+{
+	((wxSizer*)_obj)->SetSizeHints((wxWindow*) window);
+}
+	
+EWXWEXPORT(int, wxSizer_GetChildren)(void* _obj, void* _res, int _cnt)
+{
+	if (_res && (unsigned int)_cnt == ((wxSizer*)_obj)->GetChildren().GetCount())
+	{
+		int i = 0;
+		wxSizerItemList::compatibility_iterator node = ((wxSizer*)_obj)->GetChildren().GetFirst();
+		while (node)
+		{
+			((void**)_res)[i] = node->GetData();
+			node = node->GetNext();
+			++i;
+		}
+		return i;
+	}
+	else
+		return ((wxSizer*)_obj)->GetChildren().GetCount();
+}
+
+#if (wxVERSION_NUMBER >= 2800)
+EWXWEXPORT(void, wxSizer_AddSpacer)(void* _obj, int size)
+{
+  ((wxSizer*)_obj)->AddSpacer(size);
+}
+
+EWXWEXPORT(void, wxSizer_AddStretchSpacer)(void* _obj, int size)
+{
+  ((wxSizer*)_obj)->AddStretchSpacer(size);
+}
+
+EWXWEXPORT(void, wxSizer_Clear)(void* _obj, int delete_windows)
+{
+  ((wxSizer*)_obj)->Clear((bool) delete_windows);
+}
+
+EWXWEXPORT(int, wxSizer_DetachWindow)(void* _obj, void *window)
+{
+  return (int)((wxSizer*)_obj)->Detach((wxWindow*) window);
+}
+
+EWXWEXPORT(int, wxSizer_DetachSizer)(void* _obj, void *sizer)
+{
+  return (int)((wxSizer*)_obj)->Detach((wxSizer*) sizer);
+}
+
+EWXWEXPORT(int, wxSizer_Detach)(void* _obj, int index)
+{
+  return (int)((wxSizer*)_obj)->Detach((size_t) index);
+}
+
+EWXWEXPORT(void, wxSizer_FitInside)(void* _obj, void *window)
+{
+  ((wxSizer*)_obj)->FitInside((wxWindow*) window);
+}
+
+EWXWEXPORT(void *, wxSizer_GetContainingWindow)(void* _obj)
+{
+  return (void *)((wxSizer*)_obj)->GetContainingWindow();
+}
+
+EWXWEXPORT(void *, wxSizer_GetItemWindow)(void* _obj, void *window, int recursive)
+{
+  return (void *)((wxSizer*)_obj)->GetItem((wxWindow*) window, (bool) recursive);
+}
+
+EWXWEXPORT(void *, wxSizer_GetItemSizer)(void* _obj, void *sizer, int recursive)
+{
+  return (void *)((wxSizer*)_obj)->GetItem((wxSizer*) sizer, (bool) recursive);
+}
+
+EWXWEXPORT(void *, wxSizer_GetItem)(void* _obj, int index)
+{
+  return (void *)((wxSizer*)_obj)->GetItem((size_t) index);
+}
+
+EWXWEXPORT(int, wxSizer_HideWindow)(void* _obj, void *window)
+{
+  return (int)((wxSizer*)_obj)->Hide((wxWindow*) window);
+}
+
+EWXWEXPORT(int, wxSizer_HideSizer)(void* _obj, void *sizer)
+{
+  return (int)((wxSizer*)_obj)->Hide((wxSizer*) sizer);
+}
+
+EWXWEXPORT(int, wxSizer_Hide)(void* _obj, int index)
+{
+  return (int)((wxSizer*)_obj)->Hide((size_t) index);
+}
+
+EWXWEXPORT(void *, wxSizer_InsertSpacer)(void* _obj, int index, int size)
+{
+  return (void *)((wxSizer*)_obj)->InsertSpacer((size_t) index, size);
+}
+
+EWXWEXPORT(void *, wxSizer_InsertStretchSpacer)(void* _obj, int index, int prop)
+{
+  return (void *)((wxSizer*)_obj)->InsertStretchSpacer((size_t) index, prop);
+}
+
+EWXWEXPORT(int, wxSizer_IsShownWindow)(void* _obj, void *window)
+{
+  return (int)((wxSizer*)_obj)->IsShown((wxWindow*) window);
+}
+
+EWXWEXPORT(int, wxSizer_IsShownSizer)(void* _obj, void *sizer)
+{
+  return (int)((wxSizer*)_obj)->IsShown((wxSizer*) sizer);
+}
+
+EWXWEXPORT(int, wxSizer_IsShown)(void* _obj, int index)
+{
+  return (int)((wxSizer*)_obj)->IsShown((size_t) index);
+}
+
+EWXWEXPORT(void *, wxSizer_PrependSpacer)(void* _obj, int size)
+{
+  return (void *)((wxSizer*)_obj)->PrependSpacer(size);
+}
+
+EWXWEXPORT(void *, wxSizer_PrependStretchSpacer)(void* _obj, int prop)
+{
+  return (void *)((wxSizer*)_obj)->PrependStretchSpacer(prop);
+}
+
+EWXWEXPORT(int, wxSizer_ReplaceWindow)(void* _obj, void *oldwin, void *newwin, int recursive)
+{
+  return (int)((wxSizer*)_obj)->Replace((wxWindow*) oldwin, (wxWindow*) newwin, (bool) recursive);
+}
+
+EWXWEXPORT(int, wxSizer_ReplaceSizer)(void* _obj, void *oldsz, void *newsz, int recursive)
+{
+  return (int)((wxSizer*)_obj)->Replace((wxSizer*) oldsz, (wxSizer*) newsz, (bool) recursive);
+}
+
+EWXWEXPORT(int, wxSizer_Replace)(void* _obj, int oldindex, void *newsz)
+{
+  return (int)((wxSizer*)_obj)->Replace((size_t) oldindex, (wxSizerItem*) newsz);
+}
+
+EWXWEXPORT(void, wxSizer_SetVirtualSizeHints)(void* _obj, void *window)
+{
+  ((wxSizer*)_obj)->SetVirtualSizeHints((wxWindow*) window);
+}
+
+EWXWEXPORT(int, wxSizer_ShowWindow)(void* _obj, void *window, int show, int recursive)
+{
+  return (int)((wxSizer*)_obj)->Show((wxWindow*) window, (bool) show, (bool) recursive);
+}
+
+EWXWEXPORT(int, wxSizer_ShowSizer)(void* _obj, void *sizer, int show, int recursive)
+{
+  return (int)((wxSizer*)_obj)->Show((wxSizer*) sizer, (bool) show, (bool) recursive);
+}
+
+EWXWEXPORT(int, wxSizer_Show)(void* _obj, int index, int show)
+{
+  return (int)((wxSizer*)_obj)->Show((size_t) index, (bool) show);
+}
+#endif
+	
+EWXWEXPORT(void, wxSizer_SetDimension)(void* _obj, int x, int y, int width, int height)
+{
+	((wxSizer*)_obj)->SetDimension(x, y, width, height);
+}
+	
+EWXWEXPORT(void*, wxGridSizer_Create)(int rows, int cols, int vgap, int hgap)
+{
+	return (void*) new wxGridSizer(rows, cols, vgap, hgap);
+}
+	
+EWXWEXPORT(void, wxGridSizer_RecalcSizes)(void* _obj)
+{
+	((wxGridSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxGridSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxGridSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetCols)(void* _obj, int cols )
+{
+	((wxGridSizer*)_obj)->SetCols(cols);
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetRows)(void* _obj, int rows)
+{
+	((wxGridSizer*)_obj)->SetRows(rows);
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetVGap)(void* _obj, int gap)
+{
+	((wxGridSizer*)_obj)->SetVGap(gap);
+}
+	
+EWXWEXPORT(void, wxGridSizer_SetHGap)(void* _obj, int gap)
+{
+	((wxGridSizer*)_obj)->SetHGap(gap);
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetCols)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetCols();
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetRows)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetRows();
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetVGap)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetVGap();
+}
+	
+EWXWEXPORT(int, wxGridSizer_GetHGap)(void* _obj)
+{
+	return ((wxGridSizer*)_obj)->GetHGap();
+}
+	
+EWXWEXPORT(void*, wxFlexGridSizer_Create)(int rows, int cols, int vgap, int hgap)
+{
+	return new wxFlexGridSizer(rows, cols, vgap, hgap);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_RecalcSizes)(void* _obj)
+{
+	((wxFlexGridSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxFlexGridSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_AddGrowableRow)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->AddGrowableRow(idx);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_RemoveGrowableRow)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->RemoveGrowableRow(idx);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_AddGrowableCol)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->AddGrowableCol(idx);
+}
+	
+EWXWEXPORT(void, wxFlexGridSizer_RemoveGrowableCol)(void* _obj, size_t idx)
+{
+	((wxFlexGridSizer*)_obj)->RemoveGrowableCol(idx);
+}
+	
+EWXWEXPORT(void*, wxBoxSizer_Create)(int orient )
+{
+	return (void*) new wxBoxSizer(orient);
+}
+	
+EWXWEXPORT(void, wxBoxSizer_RecalcSizes)(void* _obj)
+{
+	((wxBoxSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxBoxSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxBoxSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(int, wxBoxSizer_GetOrientation)(void* _obj)
+{
+	return ((wxBoxSizer*)_obj)->GetOrientation();
+}
+	
+EWXWEXPORT(void*, wxStaticBoxSizer_Create)(void* box, int orient)
+{
+	return (void*) new wxStaticBoxSizer((wxStaticBox*) box, orient );
+}
+	
+EWXWEXPORT(void, wxStaticBoxSizer_RecalcSizes)(void* _obj)
+{
+	((wxStaticBoxSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxStaticBoxSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxStaticBoxSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void*, wxStaticBoxSizer_GetStaticBox)(void* _obj)
+{
+	return (void*)((wxStaticBoxSizer*)_obj)->GetStaticBox();
+}
+	
+#if (wxVERSION_NUMBER < 2800)
+EWXWEXPORT(void*, wxNotebookSizer_Create)(void* nb)
+{
+	return (void*) new wxNotebookSizer((wxNotebook*)nb);
+}
+	
+EWXWEXPORT(void, wxNotebookSizer_RecalcSizes)(void* _obj)
+{
+	((wxNotebookSizer*)_obj)->RecalcSizes();
+}
+	
+EWXWEXPORT(void, wxNotebookSizer_CalcMin)(void* _obj, void* _w, void* _h)
+{
+	wxSize res = ((wxNotebookSizer*)_obj)->CalcMin();
+	(*(int*)_w) = res.GetWidth();
+	(*(int*)_h) = res.GetHeight();
+}
+	
+EWXWEXPORT(void*, wxNotebookSizer_GetNotebook)(void* _obj)
+{
+	return (void*)((wxNotebookSizer*)_obj)->GetNotebook();
+}
+#endif
+
+}
wxc/wxc-2.4.dsp view
@@ -53,10 +53,10 @@ # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmswu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.12.dll" /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
+# ADD LINK32 zlib.lib regex.lib png.lib jpeg.lib tiff.lib wxmswu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.dll" /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.12.lib	move libwxc-msw2.8.9-0.10.12.a ..\dist\wxc	move wxc-msw2.8.9-0.10.12.def ..\dist\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.lib	move libwxc-msw2.8.9-0.10.13.a ..\dist\wxc	move wxc-msw2.8.9-0.10.13.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wxc - Win32 Debug"
@@ -83,10 +83,10 @@ # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.12.dll" /pdbtype:sept  /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
+# ADD LINK32 zlibd.lib regexd.lib pngd.lib jpegd.lib tiffd.lib wxmswud.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.13.dll" /pdbtype:sept  /libpath:"..\dist\wxc" /libpath:"..\..\wxWindows-2.4.2\lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.12.lib	move libwxcd-msw2.8.9-0.10.12.a ..\dist\wxc	move wxcd-msw2.8.9-0.10.12.def ..\dist\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.lib	move libwxcd-msw2.8.9-0.10.13.a ..\dist\wxc	move wxcd-msw2.8.9-0.10.13.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ENDIF
wxc/wxc-2.6.dsp view
@@ -54,10 +54,10 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib wxmsw26u_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.12.dll" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase26u.lib wxbase26u_net.lib wxbase26u_odbc.lib wxbase26u_xml.lib wxmsw26u_core.lib wxmsw26u_adv.lib wxmsw26u_dbgrid.lib wxmsw26u_gl.lib wxmsw26u_html.lib wxmsw26u_media.lib wxmsw26u_stc.lib wxmsw26u_svg.lib wxmsw26u_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.dll" /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.12.lib	move libwxc-msw2.8.9-0.10.12.a ..\dist\wxc	move wxc-msw2.8.9-0.10.12.def ..\dist\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.lib	move libwxc-msw2.8.9-0.10.13.a ..\dist\wxc	move wxc-msw2.8.9-0.10.13.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wxc - Win32 Debug"
@@ -85,10 +85,10 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26ud_svg.lib wxmsw26ud_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.12.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase26ud.lib wxbase26ud_net.lib wxbase26ud_odbc.lib wxbase26ud_xml.lib wxmsw26ud_core.lib wxmsw26ud_adv.lib wxmsw26ud_dbgrid.lib wxmsw26ud_gl.lib wxmsw26ud_html.lib wxmsw26ud_media.lib wxmsw26ud_stc.lib wxmsw26ud_svg.lib wxmsw26ud_xrc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.13.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.6.4\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.12.lib	move libwxcd-msw2.8.9-0.10.12.a ..\dist\wxc	move wxcd-msw2.8.9-0.10.12.def ..\dist\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.lib	move libwxcd-msw2.8.9-0.10.13.a ..\dist\wxc	move wxcd-msw2.8.9-0.10.13.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ENDIF
wxc/wxc-2.8.dsp view
@@ -54,10 +54,10 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
 
-# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.12.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"
+# ADD LINK32 wxzlib.lib wxregexu.lib wxpng.lib wxjpeg.lib wxtiff.lib wxexpat.lib wxbase28u.lib wxbase28u_net.lib wxbase28u_odbc.lib wxbase28u_xml.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_dbgrid.lib wxmsw28u_gl.lib wxmsw28u_html.lib wxmsw28u_media.lib wxmsw28u_stc.lib wxmsw28u_svg.lib wxmsw28u_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /machine:I386 /nodefaultlib:"LIBCMT" /out:"..\dist\wxc\wxc-msw2.8.9-0.10.13.dll" /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.12.lib	move libwxc-msw2.8.9-0.10.12.a ..\dist\wxc	move wxc-msw2.8.9-0.10.12.def ..\dist\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxc-msw2.8.9-0.10.13.lib	move libwxc-msw2.8.9-0.10.13.a ..\dist\wxc	move wxc-msw2.8.9-0.10.13.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "wxc - Win32 Debug"
@@ -85,10 +85,10 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
-# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw28ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28ud_svg.lib wxmsw28ud_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.12.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"
+# ADD LINK32 wxzlibd.lib wxregexud.lib wxpngd.lib wxjpegd.lib wxtiffd.lib wxexpatd.lib wxbase28ud.lib wxbase28ud_net.lib wxbase28ud_odbc.lib wxbase28ud_xml.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_dbgrid.lib wxmsw28ud_gl.lib wxmsw28ud_html.lib wxmsw28ud_media.lib wxmsw28ud_stc.lib wxmsw28ud_svg.lib wxmsw28ud_xrc.lib kernel32.lib user32.lib gdi32.lib gdiplus.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib opengl32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"LIBCMTD" /out:"..\dist\wxc\wxcd-msw2.8.9-0.10.13.dll" /pdbtype:sept /libpath:"..\..\wxWidgets-2.8.9\lib\vc_lib"
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
-PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.12.lib	move libwxcd-msw2.8.9-0.10.12.a ..\dist\wxc	move wxcd-msw2.8.9-0.10.12.def ..\dist\wxc	echo Done.
+PostBuild_Cmds=echo Generating mingw32 import library ...	..\bin\reimp ..\dist\wxc\wxcd-msw2.8.9-0.10.13.lib	move libwxcd-msw2.8.9-0.10.13.a ..\dist\wxc	move wxcd-msw2.8.9-0.10.13.def ..\dist\wxc	echo Done.
 # End Special Build Tool
 
 !ENDIF
wxcore.cabal view
@@ -1,5 +1,5 @@ Name:           wxcore-Version:        0.10.12+Version:        0.10.13 License:        LGPL License-file:   license.txt Homepage:       http://haskell.org/haskellwiki/WxHaskell