#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;
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
#include "bitmaps/load.xpm"
#include "bitmaps/save.xpm"
#include "bitmaps/new.xpm"
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;
-#elif defined(__WXGTK__)
+ wxString windowsDir = wxGetOSDirectory();
+ windowsDir += "\\dialoged.ini" ;
+
+ m_optionsResourceFilename = windowsDir;
+#elif defined(__WXGTK__) || defined(__WXMOTIF__)
wxGetHomeDir( &m_optionsResourceFilename );
m_optionsResourceFilename += "/.dialogedrc";
#else
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");
#ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
m_bitmapImage = new wxBitmap( wxwin_xpm );
#endif
}
{
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());
c->right.SameAs (m_editorFrame, wxRight, 0);
c->bottom.SameAs (m_editorFrame, wxBottom, 0);
c->width.Unconstrained();
-#ifdef __WXGTK__
- c->height.Absolute(105);
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+ c->height.Absolute(120);
#else
c->height.Absolute(60);
#endif
}
else
{
- wxFrame *fr = m_editorFrame;
- if (m_editorFrame->OnClose())
+ if (m_editorFrame->Close())
{
- fr->Show(FALSE);
- delete fr;
m_editorFrame = NULL;
m_editorPanel = NULL;
}
bool wxResourceManager::SaveAs()
{
wxString s(wxFileSelector("Save resource file", wxPathOnly(WXSTRINGCAST m_currentFilename), wxFileNameFromPath(WXSTRINGCAST m_currentFilename),
- "wxr", "*.wxr", wxSAVE | wxOVERWRITE_PROMPT));
+ "wxr", "*.wxr", wxSAVE | wxOVERWRITE_PROMPT, wxTheApp->GetTopWindow()));
if (s.IsNull() || s == "")
return FALSE;
wxString str = filename;
if (str == wxString(""))
{
- wxString f(wxFileSelector("Open resource file", NULL, NULL, "wxr", "*.wxr", 0, NULL));
+ wxString f(wxFileSelector("Open resource file", NULL, NULL, "wxr", "*.wxr", 0, wxTheApp->GetTopWindow()));
if (!f.IsNull() && f != "")
str = f;
else
return FALSE;
}
- if (!m_resourceTable.ParseResourceFile(WXSTRINGCAST str))
+ if (!m_resourceTable.ParseResourceFile(str))
{
wxMessageBox("Could not read file.", "Resource file load error", wxOK | wxICON_EXCLAMATION);
return FALSE;
bool wxResourceManager::Clear(bool WXUNUSED(deleteWindows), bool force)
{
+ wxPropertyInfo::CloseWindow();
+
if (!force && Modified())
{
int ans = wxMessageBox("Save modified resource file?", "Dialog Editor", wxYES_NO | wxCANCEL);
m_resourceAssociations.Put((long)resource, win);
wxNode *node = resource->GetChildren().First();
- while (node)
+ wxNode* node2 = win->GetChildren().First();
+ while (node && node2)
{
wxItemResource *child = (wxItemResource *)node->Data();
+ wxWindow* childWindow = (wxWindow*) node2->Data();
+
+ if (child->GetId() != childWindow->GetId())
+ {
+ wxString msg;
+ msg.Printf("AssociateResource: error when associating child window %ld with resource %ld", child->GetId(), childWindow->GetId());
+ wxMessageBox(msg, "Dialog Editor problem", wxOK);
+ }
+ else if (childWindow->GetName() != child->GetName())
+ {
+ wxString msg;
+ msg.Printf("AssociateResource: error when associating child window with resource %s", child->GetName() ? (const char*) child->GetName() : "(unnamed)");
+ wxMessageBox(msg, "Dialog Editor problem", wxOK);
+ }
+ else
+ {
+ AssociateResource(child, childWindow);
+ }
+
+ // New code to avoid the problem of duplicate ids and names. We simply
+ // traverse the child windows and child resources in parallel,
+ // checking for any mismatch.
+#if 0
wxWindow *childWindow = (wxWindow *)m_resourceAssociations.Get((long)child);
if (!childWindow)
- childWindow = win->FindWindow(child->GetName());
+ // childWindow = win->FindWindow(child->GetName());
+ childWindow = win->FindWindow(child->GetId());
if (childWindow)
AssociateResource(child, childWindow);
else
{
- char buf[200];
- sprintf(buf, "AssociateResource: cannot find child window %s", child->GetName() ? (const char*) child->GetName() : "(unnamed)");
- wxMessageBox(buf, "Dialog Editor problem", wxOK);
+ wxString msg;
+ msg.Printf("AssociateResource: cannot find child window %s", child->GetName() ? (const char*) child->GetName() : "(unnamed)");
+ wxMessageBox(msg, "Dialog Editor problem", wxOK);
}
-
+#endif
node = node->Next();
+ node2 = node2->Next();
}
}
{
wxResourceEditorScrolledWindow *panel = new wxResourceEditorScrolledWindow(parent, wxDefaultPosition, wxDefaultSize,
// wxSUNKEN_BORDER|wxCLIP_CHILDREN);
+#ifdef __WXMOTIF__
+ wxBORDER);
+#else
wxSUNKEN_BORDER);
+#endif
panel->SetScrollbars(10, 10, 100, 100);
wxBitmap ToolbarToFrontBitmap("TOFRONTTOOL");
wxBitmap ToolbarHelpBitmap("HELPTOOL");
#endif
-#ifdef __WXGTK__
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
wxBitmap ToolbarLoadBitmap( load_xpm );
wxBitmap ToolbarSaveBitmap( save_xpm);
wxBitmap ToolbarNewBitmap( new_xpm );
int currentX = gap;
toolbar->AddSeparator();
toolbar->AddTool(TOOLBAR_NEW, ToolbarNewBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "New dialog");
+ FALSE, currentX, -1, NULL, "New dialog");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_LOAD_FILE, ToolbarLoadBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Load");
+ FALSE, currentX, -1, NULL, "Load");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_SAVE_FILE, ToolbarSaveBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Save");
+ FALSE, currentX, -1, NULL, "Save");
currentX += width + dx + gap;
toolbar->AddSeparator();
toolbar->AddTool(TOOLBAR_FORMAT_HORIZ, ToolbarVertBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Horizontal align");
+ FALSE, currentX, -1, NULL, "Horizontal align");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_FORMAT_VERT_TOP_ALIGN, ToolbarAlignTBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Top align");
+ FALSE, currentX, -1, NULL, "Top align");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_FORMAT_VERT_BOT_ALIGN, ToolbarAlignBBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Bottom align");
+ FALSE, currentX, -1, NULL, "Bottom align");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_FORMAT_VERT, ToolbarHorizBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Vertical align");
+ FALSE, currentX, -1, NULL, "Vertical align");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_FORMAT_HORIZ_LEFT_ALIGN, ToolbarAlignLBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Left align");
+ FALSE, currentX, -1, NULL, "Left align");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_FORMAT_HORIZ_RIGHT_ALIGN, ToolbarAlignRBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Right align");
+ FALSE, currentX, -1, NULL, "Right align");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_COPY_SIZE, ToolbarCopySizeBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Copy size");
+ FALSE, currentX, -1, NULL, "Copy size");
currentX += width + dx + gap;
toolbar->AddSeparator();
toolbar->AddTool(TOOLBAR_TO_FRONT, ToolbarToFrontBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "To front");
+ FALSE, currentX, -1, NULL, "To front");
currentX += width + dx;
toolbar->AddTool(TOOLBAR_TO_BACK, ToolbarToBackBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "To back");
+ FALSE, currentX, -1, NULL, "To back");
currentX += width + dx + gap;
toolbar->AddSeparator();
toolbar->AddTool(TOOLBAR_HELP, ToolbarHelpBitmap, wxNullBitmap,
- FALSE, (float)currentX, -1, NULL, "Help");
+ FALSE, currentX, -1, NULL, "Help");
currentX += width + dx;
toolbar->Realize();
bool wxResourceManager::Edit(wxItemResource *res)
{
+ wxPropertyInfo::CloseWindow();
+
ClearCurrentDialog();
wxString resType(res->GetType());
bool wxResourceManager::CreateNewPanel()
{
+ wxPropertyInfo::CloseWindow();
+
ClearCurrentDialog();
char buf[256];
MakeUniqueName("button", buf);
res->SetName(buf);
if (isBitmap)
- newItem = new wxBitmapButton(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
+ newItem = new wxBitmapButton(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), wxBU_AUTODRAW, wxDefaultValidator, buf);
else
newItem = new wxButton(panel, -1, "Button", wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
}
prefix = "ID_BITMAPBUTTON";
MakeUniqueName("button", buf);
res->SetName(buf);
- newItem = new wxBitmapButton(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
+ newItem = new wxBitmapButton(panel, -1, * m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), wxBU_AUTODRAW, wxDefaultValidator, buf);
}
else if (itemType == "wxMessage" || itemType == "wxStaticText")
{
{
item->SetSize(-1, -1, firstW, firstH);
+ int fw = firstW;
+ int fh = firstH;
+
wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item->GetParent());
if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
{
wxSize sz = item->GetParent()->ConvertPixelsToDialog(wxSize(firstW, firstH));
- firstW = sz.x; firstH = sz.y;
+ fw = sz.x; fh = sz.y;
}
- resource->SetSize(resource->GetX(), resource->GetY(), firstW, firstH);
+ resource->SetSize(resource->GetX(), resource->GetY(), fw, fh);
}
}
m_selections.DeleteObject(win);
}
+void wxResourceManager::DeselectItemIfNecessary(wxWindow *win)
+{
+ if (win->IsKindOf(CLASSINFO(wxControl)) && (win->GetEventHandler() != win))
+ {
+ // Deselect and refresh window in case we leave selection
+ // handles behind
+ wxControl *item = (wxControl *)win;
+ wxResourceEditorControlHandler *childHandler = (wxResourceEditorControlHandler *)item->GetEventHandler();
+ if (childHandler->IsSelected())
+ {
+ wxResourceManager::GetCurrentResourceManager()->RemoveSelection(item);
+ childHandler->SelectItem(FALSE);
+#ifndef __WXGTK__
+ item->GetParent()->Refresh();
+#endif
+ }
+ }
+}
+
// Need to search through resource table removing this from
// any resource which has this as a parent.
bool wxResourceManager::RemoveResourceFromParent(wxItemResource *res)
bool wxResourceManager::DeleteResource(wxWindow *win)
{
- if (win->IsKindOf(CLASSINFO(wxControl)))
- {
- // Deselect and refresh window in case we leave selection
- // handles behind
- wxControl *item = (wxControl *)win;
- wxResourceEditorControlHandler *childHandler = (wxResourceEditorControlHandler *)item->GetEventHandler();
- if (childHandler->IsSelected())
- {
- RemoveSelection(item);
- childHandler->SelectItem(FALSE);
-#ifndef __WXGTK__
- item->GetParent()->Refresh();
-#endif
- }
- }
+ DeselectItemIfNecessary(win);
wxItemResource *res = FindResourceForWindow(win);
wxItemResource *child = (wxItemResource *)node->Data();
return child->GetName();
- node = node->Next();
+ //node = node->Next();
}
return wxEmptyString;
}
// Deletes 'win' and creates a new window from the resource that
// was associated with it. E.g. if you can't change properties on the
// fly, you'll need to delete the window and create it again.
-wxWindow *wxResourceManager::RecreateWindowFromResource(wxWindow *win, wxWindowPropertyInfo *info)
+wxWindow *wxResourceManager::RecreateWindowFromResource(wxWindow *win, wxWindowPropertyInfo *info, bool instantiateFirst)
{
wxItemResource *resource = FindResourceForWindow(win);
info = newInfo;
}
- info->InstantiateResource(resource);
+ // May not always want to copy values back from the resource
+ if (instantiateFirst)
+ info->InstantiateResource(resource);
wxWindow *newWin = NULL;
wxWindow *parent = win->GetParent();
EVT_MENU(RESED_DELETE, wxResourceEditorFrame::OnDeleteSelection)
EVT_MENU(RESED_RECREATE, wxResourceEditorFrame::OnRecreateSelection)
EVT_MENU(RESED_TEST, wxResourceEditorFrame::OnTest)
+ EVT_CLOSE(wxResourceEditorFrame::OnCloseWindow)
END_EVENT_TABLE()
wxResourceEditorFrame::wxResourceEditorFrame(wxResourceManager *resMan, wxFrame *parent, const wxString& title,
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);
}
manager->RecreateSelection();
}
-bool wxResourceEditorFrame::OnClose()
+void wxResourceEditorFrame::OnCloseWindow(wxCloseEvent& event)
{
+ wxPropertyInfo::CloseWindow();
if (manager->Modified())
{
- if (!manager->Clear(TRUE, FALSE))
- return FALSE;
+ if (!manager->Clear(TRUE, FALSE))
+ {
+ event.Veto();
+ return;
+ }
}
- if (!Iconized())
+ if (!IsIconized())
{
int w, h;
GetSize(&w, &h);
manager->SetEditorFrame(NULL);
manager->SetEditorToolBar(NULL);
- return TRUE;
+ this->Destroy();
}
/*
*/
BEGIN_EVENT_TABLE(wxResourceEditorScrolledWindow, wxScrolledWindow)
- EVT_SCROLL(wxResourceEditorScrolledWindow::OnScroll)
EVT_PAINT(wxResourceEditorScrolledWindow::OnPaint)
END_EVENT_TABLE()
m_marginX = 10;
m_marginY = 40;
m_childWindow = NULL;
-}
-wxResourceEditorScrolledWindow::~wxResourceEditorScrolledWindow()
-{
+ SetBackgroundColour(* wxWHITE);
}
-void wxResourceEditorScrolledWindow::OnScroll(wxScrollEvent& event)
+wxResourceEditorScrolledWindow::~wxResourceEditorScrolledWindow()
{
- 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))
}
// 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;
}
case OBJECT_MENU_DELETE:
{
+ wxResourceManager::GetCurrentResourceManager()->DeselectItemIfNecessary(data);
+
wxResourceManager::GetCurrentResourceManager()->SaveInfoAndDeleteHandler(data);
wxResourceManager::GetCurrentResourceManager()->DeleteResource(data);
wxResourceManager::GetCurrentResourceManager()->DeleteWindow(data);
*
*/
-#ifdef __WXGTK__ // 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)
projects / wxWidgets.git / blobdiff