#include <math.h>
#include <string.h>
-#if wxUSE_IOSTREAMH
-#if defined(__WXMSW__) && !defined(__GNUWIN32__)
-#include <strstrea.h>
-#else
-#include <strstream.h>
-#endif
-#else
-#include <strstream>
-#endif
-
-#ifdef __WXMSW__
-#include <windows.h>
-#endif
-
#ifdef __WXMSW__
#include "wx/help.h"
#endif
#include "edtree.h"
#include "edlist.h"
-static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);
wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
#if defined(__WXGTK__) || defined(__WXMOTIF__)
bool wxResourceManager::Initialize()
{
// Set up the resource filename for each platform.
+ // TODO: This shold be replaced by wxConfig usage.
#ifdef __WXMSW__
// dialoged.ini in the Windows directory
- char buf[256];
- GetWindowsDirectory(buf, 256);
- strcat(buf, "\\dialoged.ini");
- m_optionsResourceFilename = buf;
+ wxString windowsDir = wxGetOSDirectory();
+ windowsDir += "\\dialoged.ini" ;
+
+ m_optionsResourceFilename = windowsDir;
#elif defined(__WXGTK__) || defined(__WXMOTIF__)
wxGetHomeDir( &m_optionsResourceFilename );
m_optionsResourceFilename += "/.dialogedrc";
m_helpController->Initialize("dialoged");
#endif
- m_popupMenu = new wxMenu("", (wxFunction)ObjectMenuProc);
+ m_popupMenu = new wxMenu;
m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
m_popupMenu->Append(OBJECT_MENU_DELETE, "Delete object");
{
wxConfig config("DialogEd", "wxWindows");
- config.Write("editorWindowX", m_resourceEditorWindowSize.x);
- config.Write("editorWindowY", m_resourceEditorWindowSize.y);
- config.Write("editorWindowWidth", m_resourceEditorWindowSize.width);
- config.Write("editorWindowHeight", m_resourceEditorWindowSize.height);
- config.Write("propertyWindowX", m_propertyWindowSize.x);
- config.Write("propertyWindowY", m_propertyWindowSize.y);
- config.Write("propertyWindowWidth", m_propertyWindowSize.width);
- config.Write("propertyWindowHeight", m_propertyWindowSize.height);
+ config.Write("editorWindowX", (long) m_resourceEditorWindowSize.x);
+ config.Write("editorWindowY", (long) m_resourceEditorWindowSize.y);
+ config.Write("editorWindowWidth", (long) m_resourceEditorWindowSize.width);
+ config.Write("editorWindowHeight", (long) m_resourceEditorWindowSize.height);
+ config.Write("propertyWindowX", (long) m_propertyWindowSize.x);
+ config.Write("propertyWindowY", (long) m_propertyWindowSize.y);
+ config.Write("propertyWindowWidth", (long) m_propertyWindowSize.width);
+ config.Write("propertyWindowHeight", (long) m_propertyWindowSize.height);
/*
wxWriteResource("DialogEd", "editorWindowX", m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
wxWriteResource("DialogEd", "editorWindowY", m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
}
else
{
- wxFrame *fr = m_editorFrame;
if (m_editorFrame->Close())
{
m_editorFrame = NULL;
wxItemResource *child = (wxItemResource *)node->Data();
return child->GetName();
- node = node->Next();
+ //node = node->Next();
}
return wxEmptyString;
}
void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
char buf[300];
- sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart J.Smart@ed.ac.uk\nJulian Smart (c) 1996", wxDIALOG_EDITOR_VERSION);
+ sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart <julian.smart@ukonline.co.uk>\nJulian Smart (c) 1996-1999", wxDIALOG_EDITOR_VERSION);
wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
}
}
}
- if (!Iconized())
+ if (!IsIconized())
{
int w, h;
GetSize(&w, &h);
*/
BEGIN_EVENT_TABLE(wxResourceEditorScrolledWindow, wxScrolledWindow)
- EVT_SCROLL(wxResourceEditorScrolledWindow::OnScroll)
EVT_PAINT(wxResourceEditorScrolledWindow::OnPaint)
END_EVENT_TABLE()
{
}
-void wxResourceEditorScrolledWindow::OnScroll(wxScrollEvent& event)
-{
- wxScrolledWindow::OnScroll(event);
-
- int x, y;
- ViewStart(& x, & y);
-
- if (m_childWindow)
- m_childWindow->Move(m_marginX + (- x * 10), m_marginY + (- y * 10));
-}
-
void wxResourceEditorScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
}
// Popup menu callback
-void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event)
+void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
{
- wxWindow *data = (wxWindow *)menu.GetClientData();
+ wxWindow *data = (wxWindow *)menu->GetClientData();
if (!data)
return;
*
*/
-#if defined(__WXGTK__) || defined(__WXMOTIF__) // I don't dare to delete it...
-
-BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
-END_EVENT_TABLE()
-
-#else
-
BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
- EVT_PAINT(EditorToolBar::OnPaint)
+// EVT_PAINT(EditorToolBar::OnPaint)
END_EVENT_TABLE()
-#endif
-
EditorToolBar::EditorToolBar(wxFrame *frame, const wxPoint& pos, const wxSize& size,
long style):
wxToolBar(frame, -1, pos, size, style)