#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"
#include "bitmaps/toback.xpm"
#include "bitmaps/help.xpm"
#include "bitmaps/wxwin.xpm"
+
+#include "bitmaps/dialog.xpm"
+#include "bitmaps/folder1.xpm"
+#include "bitmaps/folder2.xpm"
+#include "bitmaps/buttonsm.xpm"
#endif
/*
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
}
wxIcon icon2("FOLDER1_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
wxIcon icon3("FOLDER2_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
wxIcon icon4("BUTTONSM_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
+#else
+ wxIcon icon1( dialog_xpm );
+ wxIcon icon2( folder1_xpm );
+ wxIcon icon3( folder2_xpm );
+ wxIcon icon4( buttonsm_xpm );
+#endif
m_imageList.Add(icon1);
m_imageList.Add(icon2);
m_imageList.Add(icon3);
m_imageList.Add(icon4);
-#endif
m_symbolTable.AddStandardSymbols();
{
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
{
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();
break;
}
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item->GetParent());
+
item->SetSize(newX, newY, w, h);
+
+ // Also update the associated resource
+ // We need to convert to dialog units if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxPoint pt = item->GetParent()->ConvertPixelsToDialog(wxPoint(newX, newY));
+ newX = pt.x; newY = pt.y;
+ wxSize sz = item->GetParent()->ConvertPixelsToDialog(wxSize(w, h));
+ w = sz.x; h = sz.y;
+ }
+ resource->SetSize(newX, newY, w, h);
}
}
win->Refresh();
{
wxControl *item = (wxControl *)node->Data();
if (item->GetParent() == win)
+ {
item->SetSize(-1, -1, firstW, firstH);
+
+ wxItemResource* resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item);
+ wxItemResource* parentResource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(item->GetParent());
+
+ // Also update the associated resource
+ // We need to convert to dialog units if this is not a dialog or panel, but
+ // the parent resource specifies dialog units.
+ if (parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS)
+ {
+ wxSize sz = item->GetParent()->ConvertPixelsToDialog(wxSize(firstW, firstH));
+ firstW = sz.x; firstH = sz.y;
+ }
+ resource->SetSize(resource->GetX(), resource->GetY(), firstW, firstH);
+
+ }
}
win->Refresh();
}
wxItemResource *child = (wxItemResource *)node->Data();
return child->GetName();
- node = node->Next();
+ //node = node->Next();
}
return wxEmptyString;
}
{
info = new wxRadioButtonPropertyInfo(win);
}
- else if (win->IsKindOf(CLASSINFO(wxChoice)))
- {
- info = new wxChoicePropertyInfo(win);
- }
else if (win->IsKindOf(CLASSINFO(wxComboBox)))
{
info = new wxComboBoxPropertyInfo(win);
}
- else if (win->IsKindOf(CLASSINFO(wxButton)))
+ else if (win->IsKindOf(CLASSINFO(wxChoice)))
{
- info = new wxButtonPropertyInfo(win);
+ info = new wxChoicePropertyInfo(win);
}
else if (win->IsKindOf(CLASSINFO(wxBitmapButton)))
{
info = new wxBitmapButtonPropertyInfo(win);
}
- else if (win->IsKindOf(CLASSINFO(wxStaticText)))
+ else if (win->IsKindOf(CLASSINFO(wxButton)))
{
- info = new wxStaticTextPropertyInfo(win);
+ info = new wxButtonPropertyInfo(win);
}
else if (win->IsKindOf(CLASSINFO(wxStaticBitmap)))
{
info = new wxStaticBitmapPropertyInfo(win);
}
+ else if (win->IsKindOf(CLASSINFO(wxStaticText)))
+ {
+ info = new wxStaticTextPropertyInfo(win);
+ }
else if (win->IsKindOf(CLASSINFO(wxTextCtrl)))
{
info = new wxTextPropertyInfo(win);
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::OnExit(wxCommandEvent& WXUNUSED(event))
{
- manager->Clear(TRUE, FALSE) ;
- this->Close();
+ manager->Clear(TRUE, FALSE) ;
+ this->Destroy();
}
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)
{
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;
*
*/
-#ifdef __WXGTK__ // I don't dare to delete it...
-
BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
+// EVT_PAINT(EditorToolBar::OnPaint)
END_EVENT_TABLE()
-#else
-
-BEGIN_EVENT_TABLE(EditorToolBar, wxToolBar)
- 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