#include "wx/gauge.h"
#include "wx/slider.h"
#include "wx/textctrl.h"
+#include "wx/menu.h"
+#include "wx/toolbar.h"
#endif
#include "wx/scrolbar.h"
+#include "wx/config.h"
#include <ctype.h>
#include <stdlib.h>
#include <windows.h>
#endif
+#ifdef __WXMSW__
#include "wx/help.h"
+#endif
#include "reseditr.h"
#include "winprop.h"
static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);
wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
-#ifdef __X__
-#include "bitmaps/load.xbm"
-#include "bitmaps/save.xbm"
-#include "bitmaps/new.xbm"
-#include "bitmaps/vert.xbm"
-#include "bitmaps/alignt.xbm"
-#include "bitmaps/alignb.xbm"
-#include "bitmaps/horiz.xbm"
-#include "bitmaps/alignl.xbm"
-#include "bitmaps/alignr.xbm"
-#include "bitmaps/copysize.xbm"
-#include "bitmaps/tofront.xbm"
-#include "bitmaps/toback.xbm"
-#include "bitmaps/help.xbm"
-#include "bitmaps/wxwin.xbm"
+#ifdef __WXGTK__
+#include "bitmaps/load.xpm"
+#include "bitmaps/save.xpm"
+#include "bitmaps/new.xpm"
+#include "bitmaps/vert.xpm"
+#include "bitmaps/alignt.xpm"
+#include "bitmaps/alignb.xpm"
+#include "bitmaps/horiz.xpm"
+#include "bitmaps/alignl.xpm"
+#include "bitmaps/alignr.xpm"
+#include "bitmaps/copysize.xpm"
+#include "bitmaps/tofront.xpm"
+#include "bitmaps/toback.xpm"
+#include "bitmaps/help.xpm"
+#include "bitmaps/wxwin.xpm"
#endif
/*
m_editorResourceTree = NULL;
m_editorControlList = NULL;
m_nameCounter = 1;
+ m_symbolIdCounter = 99;
m_modified = FALSE;
m_currentFilename = "";
m_symbolFilename = "";
m_editorToolBar = NULL;
// Default window positions
- m_resourceEditorWindowSize.width = 470;
- m_resourceEditorWindowSize.height = 300;
+ m_resourceEditorWindowSize.width = 500;
+ m_resourceEditorWindowSize.height = 450;
m_resourceEditorWindowSize.x = 0;
m_resourceEditorWindowSize.y = 0;
m_propertyWindowSize.width = 300;
m_propertyWindowSize.height = 300;
+#ifdef __WXMSW__
m_helpController = NULL;
+#endif
m_bitmapImage = NULL;
m_rootDialogItem = 0;
sm_currentResourceManager = NULL;
SaveOptions();
+#ifdef __WXMSW__
if (m_helpController)
{
m_helpController->Quit();
delete m_helpController;
m_helpController = NULL;
}
+#endif
+
delete m_bitmapImage;
delete m_popupMenu;
}
GetWindowsDirectory(buf, 256);
strcat(buf, "\\dialoged.ini");
m_optionsResourceFilename = buf;
-#elif defined(__X__)
- char buf[500];
- ()wxGetHomeDir(buf);
- strcat(buf, "/.dialogedrc");
- m_optionsResourceFilename = buf;
+#elif defined(__WXGTK__)
+ wxGetHomeDir( &m_optionsResourceFilename );
+ m_optionsResourceFilename += "/.dialogedrc";
#else
#error "Unsupported platform."
#endif
LoadOptions();
+#ifdef __WXMSW__
m_helpController = new wxHelpController;
m_helpController->Initialize("dialoged");
+#endif
m_popupMenu = new wxMenu("", (wxFunction)ObjectMenuProc);
m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
#ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
-#ifdef __X__
- m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height);
+#ifdef __WXGTK__
+ m_bitmapImage = new wxBitmap( wxwin_xpm );
#endif
}
m_imageList.Add(icon4);
#endif
+ m_symbolTable.AddStandardSymbols();
+
return TRUE;
}
bool wxResourceManager::LoadOptions()
{
+ wxConfig config("DialogEd", "wxWindows");
+
+ config.Read("editorWindowX", &m_resourceEditorWindowSize.x);
+ config.Read("editorWindowY", &m_resourceEditorWindowSize.y);
+ config.Read("editorWindowWidth", &m_resourceEditorWindowSize.width);
+ config.Read("editorWindowHeight", &m_resourceEditorWindowSize.height);
+ config.Read("propertyWindowX", &m_propertyWindowSize.x);
+ config.Read("propertyWindowY", &m_propertyWindowSize.y);
+ config.Read("propertyWindowWidth", &m_propertyWindowSize.width);
+ config.Read("propertyWindowHeight", &m_propertyWindowSize.height);
+
+ /*
wxGetResource("DialogEd", "editorWindowX", &m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
wxGetResource("DialogEd", "editorWindowY", &m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
wxGetResource("DialogEd", "editorWindowWidth", &m_resourceEditorWindowSize.width, m_optionsResourceFilename.GetData());
wxGetResource("DialogEd", "propertyWindowY", &m_propertyWindowSize.y, m_optionsResourceFilename.GetData());
wxGetResource("DialogEd", "propertyWindowWidth", &m_propertyWindowSize.width, m_optionsResourceFilename.GetData());
wxGetResource("DialogEd", "propertyWindowHeight", &m_propertyWindowSize.height, m_optionsResourceFilename.GetData());
+ */
return TRUE;
}
bool wxResourceManager::SaveOptions()
{
+ 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);
+ /*
wxWriteResource("DialogEd", "editorWindowX", m_resourceEditorWindowSize.x, m_optionsResourceFilename.GetData());
wxWriteResource("DialogEd", "editorWindowY", m_resourceEditorWindowSize.y, m_optionsResourceFilename.GetData());
wxWriteResource("DialogEd", "editorWindowWidth", m_resourceEditorWindowSize.width, m_optionsResourceFilename.GetData());
wxWriteResource("DialogEd", "propertyWindowY", m_propertyWindowSize.y, m_optionsResourceFilename.GetData());
wxWriteResource("DialogEd", "propertyWindowWidth", m_propertyWindowSize.width, m_optionsResourceFilename.GetData());
wxWriteResource("DialogEd", "propertyWindowHeight", m_propertyWindowSize.height, m_optionsResourceFilename.GetData());
+ */
return TRUE;
}
// Show or hide the resource editor frame, which displays a list
// of resources with ability to edit them.
-bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *parent, const char *title)
+bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent), const char *title)
{
if (show)
{
c->right.SameAs (m_editorFrame, wxRight, 0);
c->bottom.SameAs (m_editorFrame, wxBottom, 0);
c->width.Unconstrained();
+#ifdef __WXGTK__
+ c->height.Absolute(140);
+#else
c->height.Absolute(60);
+#endif
+
m_editorControlList->SetConstraints(c);
m_editorFrame->SetAutoLayout(TRUE);
InstantiateAllResourcesFromWindows();
if (m_resourceTable.Save(filename))
{
+ m_symbolTable.WriteIncludeFile(m_symbolFilename);
Modify(FALSE);
return TRUE;
}
return FALSE;
m_currentFilename = s;
+ wxStripExtension(m_currentFilename);
+ m_currentFilename += ".wxr";
+
+ // Construct include filename from this file
+ m_symbolFilename = m_currentFilename;
+
+ wxStripExtension(m_symbolFilename);
+ m_symbolFilename += ".h";
+
Save(m_currentFilename);
return TRUE;
}
if (!Clear(TRUE, FALSE))
return FALSE;
+ m_symbolTable.AddStandardSymbols();
+
if (loadFromFile)
{
wxString str = filename;
// Construct include filename from this file
m_symbolFilename = m_currentFilename;
- if (m_symbolFilename[0] == 'c')
- {
- }
-
- wxString stringA("123456.45");
- wxString stringB("");
- stringB = str;
-
- size_t i = 0;
- char c = stringB[i];
-#if 0
- size_t len = stringB.Length();
- size_t i = len-1;
- while (i > 0)
- {
- // if (buffer.GetChar(i) == '.')
- if (stringB[i] == '.')
- {
- stringB = stringB.Left(i);
- break;
- }
- i --;
- }
-#endif
-
-#if 0
- size_t len = m_symbolFilename.Length();
- size_t i = len-1;
- while (i > 0)
- {
- // if (buffer.GetChar(i) == '.')
- if (m_symbolFilename[i] == '.')
- {
- m_symbolFilename = m_symbolFilename.Left(i);
- break;
- }
- i --;
- }
-#endif
-// wxStripExtension(m_symbolFilename);
+ wxStripExtension(m_symbolFilename);
m_symbolFilename += ".h";
if (!m_symbolTable.ReadIncludeFile(m_symbolFilename))
{
wxString str("Could not find include file ");
str += m_symbolFilename;
- wxMessageBox(str, "Dialog Editor Warning", MB_OK);
+ str += ".\nDialog Editor maintains a header file containing id symbols to be used in the application.\n";
+ str += "The next time this .wxr file is saved, a header file will be saved also.";
+ wxMessageBox(str, "Dialog Editor Warning", wxOK );
+
+ m_symbolIdCounter = 99;
+ }
+ else
+ {
+ // Set the id counter to the last known id
+ m_symbolIdCounter = m_symbolTable.FindHighestId();
+ }
+
+ // Now check in case some (or all) resources don't have resource ids, or they
+ // don't match the .h file, or something of that nature.
+ bool altered = RepairResourceIds();
+ if (altered)
+ {
+ wxMessageBox("Some resources have had new identifiers associated with them, since they were missing.",
+ "Dialog Editor Warning", wxOK );
+ Modify(TRUE);
}
+ else
+ Modify(FALSE);
+
+ return TRUE;
}
else
{
return TRUE;
}
-bool wxResourceManager::Clear(bool deleteWindows, bool force)
+bool wxResourceManager::Clear(bool WXUNUSED(deleteWindows), bool force)
{
if (!force && Modified())
{
frame->SetAutoLayout(TRUE);
#ifdef __WXMSW__
- wxIcon *icon = new wxIcon("DIALOGEDICON");
- frame->SetIcon(icon);
+ frame->SetIcon(wxIcon("DIALOGEDICON"));
#endif
return frame;
}
-wxMenuBar *wxResourceManager::OnCreateEditorMenuBar(wxFrame *parent)
+wxMenuBar *wxResourceManager::OnCreateEditorMenuBar(wxFrame *WXUNUSED(parent))
{
wxMenuBar *menuBar = new wxMenuBar;
return panel;
}
-wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
+wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
{
// Load palette bitmaps
#ifdef __WXMSW__
wxBitmap ToolbarToFrontBitmap("TOFRONTTOOL");
wxBitmap ToolbarHelpBitmap("HELPTOOL");
#endif
-#ifdef __X__
- wxBitmap ToolbarLoadBitmap(load_bits, load_width, load_height);
- wxBitmap ToolbarSaveBitmap(save_bits, save_width, save_height);
- wxBitmap ToolbarNewBitmap(new_bits, save_width, save_height);
- wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height);
- wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height);
- wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height);
- wxBitmap ToolbarHorizBitmap(horiz_bits, horiz_width, horiz_height);
- wxBitmap ToolbarAlignLBitmap(alignl_bits, alignl_width, alignl_height);
- wxBitmap ToolbarAlignRBitmap(alignr_bits, alignr_width, alignr_height);
- wxBitmap ToolbarCopySizeBitmap(copysize_bits, copysize_width, copysize_height);
- wxBitmap ToolbarToBackBitmap(toback_bits, toback_width, toback_height);
- wxBitmap ToolbarToFrontBitmap(tofront_bits, tofront_width, tofront_height);
- wxBitmap ToolbarHelpBitmap(help_bits, help_width, help_height);
+#ifdef __WXGTK__
+ wxBitmap ToolbarLoadBitmap( load_xpm );
+ wxBitmap ToolbarSaveBitmap( save_xpm);
+ wxBitmap ToolbarNewBitmap( new_xpm );
+ wxBitmap ToolbarVertBitmap( vert_xpm );
+ wxBitmap ToolbarAlignTBitmap( alignt_xpm );
+ wxBitmap ToolbarAlignBBitmap( alignb_xpm );
+ wxBitmap ToolbarHorizBitmap( horiz_xpm );
+ wxBitmap ToolbarAlignLBitmap( alignl_xpm );
+ wxBitmap ToolbarAlignRBitmap( alignr_xpm );
+ wxBitmap ToolbarCopySizeBitmap( copysize_xpm );
+ wxBitmap ToolbarToBackBitmap( toback_xpm );
+ wxBitmap ToolbarToFrontBitmap( tofront_xpm );
+ wxBitmap ToolbarHelpBitmap( help_xpm );
#endif
// Create the toolbar
int dx = 2;
int gap = 6;
#else
- int width = ToolbarLoadBitmap->GetWidth();
+ int width = 24; // ToolbarLoadBitmap->GetWidth(); ???
int dx = 2;
int gap = 6;
#endif
node = node->Next();
}
}
- m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);
+// m_editorResourceTree->ExpandItem(id, wxTREE_EXPAND_EXPAND);
}
bool wxResourceManager::EditSelectedResource()
}
else
{
- long style = res->GetStyle();
- res->SetStyle(style|wxRAISED_BORDER);
+// long style = res->GetStyle();
+// res->SetStyle(style|wxRAISED_BORDER);
panel = new wxPanel;
wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(),
this);
panel->PushEventHandler(handler);
- res->SetStyle(style);
+// res->SetStyle(style);
handler->AddChildHandlers(); // Add event handlers for all controls
AssociateResource(res, panel);
ClearCurrentDialog();
char buf[256];
- MakeUniqueName("panel", buf);
+ MakeUniqueName("dialog", buf);
wxItemResource *resource = new wxItemResource;
-// resource->SetType(wxTYPE_PANEL);
- resource->SetType("wxPanel");
+ resource->SetType("wxDialog");
resource->SetName(buf);
resource->SetTitle(buf);
+
+ wxString newIdName;
+ int id = GenerateWindowId("ID_DIALOG", newIdName);
+ resource->SetId(id);
+
+ // This is now guaranteed to be unique, so just add to symbol table
+ m_symbolTable.AddSymbol(newIdName, id);
+
m_resourceTable.AddResource(resource);
wxPanel *panel = new wxPanel(m_editorPanel, -1,
wxPoint(m_editorPanel->GetMarginX(), m_editorPanel->GetMarginY()),
- wxSize(400, 300), wxRAISED_BORDER, buf);
+ wxSize(400, 300), wxRAISED_BORDER|wxDEFAULT_DIALOG_STYLE, buf);
m_editorPanel->m_childWindow = panel;
- resource->SetStyle(0); // panel->GetWindowStyleFlag());
+ resource->SetStyle(panel->GetWindowStyleFlag());
resource->SetSize(10, 10, 400, 300);
// For editing in situ we will need to use the hash table to ensure
wxControl *newItem = NULL;
res->SetSize(x, y, -1, -1);
res->SetType(iType);
+
+ wxString prefix;
wxString itemType(iType);
if (itemType == "wxButton")
{
+ prefix = "ID_BUTTON";
MakeUniqueName("button", buf);
res->SetName(buf);
if (isBitmap)
}
if (itemType == "wxBitmapButton")
{
+ 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);
}
else if (itemType == "wxMessage" || itemType == "wxStaticText")
{
- MakeUniqueName("message", buf);
+ prefix = "ID_STATIC";
+ MakeUniqueName("statictext", buf);
res->SetName(buf);
if (isBitmap)
newItem = new wxStaticBitmap(panel, -1, m_bitmapImage, wxPoint(x, y), wxSize(0, 0), 0, buf);
else
- newItem = new wxStaticText(panel, -1, "Message", wxPoint(x, y), wxSize(-1, -1), 0, buf);
+ newItem = new wxStaticText(panel, -1, "Static", wxPoint(x, y), wxSize(-1, -1), 0, buf);
}
else if (itemType == "wxStaticBitmap")
{
- MakeUniqueName("message", buf);
+ prefix = "ID_STATICBITMAP";
+ MakeUniqueName("static", buf);
res->SetName(buf);
newItem = new wxStaticBitmap(panel, -1, m_bitmapImage, wxPoint(x, y), wxSize(-1, -1), 0, buf);
}
else if (itemType == "wxCheckBox")
{
+ prefix = "ID_CHECKBOX";
MakeUniqueName("checkbox", buf);
res->SetName(buf);
newItem = new wxCheckBox(panel, -1, "Checkbox", wxPoint(x, y), wxSize(-1, -1), 0, wxDefaultValidator, buf);
}
else if (itemType == "wxListBox")
{
+ prefix = "ID_LISTBOX";
MakeUniqueName("listbox", buf);
res->SetName(buf);
newItem = new wxListBox(panel, -1, wxPoint(x, y), wxSize(-1, -1), 0, NULL, 0, wxDefaultValidator, buf);
}
else if (itemType == "wxRadioBox")
{
+ prefix = "ID_RADIOBOX";
MakeUniqueName("radiobox", buf);
res->SetName(buf);
wxString names[] = { "One", "Two" };
}
else if (itemType == "wxRadioButton")
{
+ prefix = "ID_RADIOBUTTON";
MakeUniqueName("radiobutton", buf);
res->SetName(buf);
wxString names[] = { "One", "Two" };
}
else if (itemType == "wxChoice")
{
+ prefix = "ID_CHOICE";
MakeUniqueName("choice", buf);
res->SetName(buf);
newItem = new wxChoice(panel, -1, wxPoint(x, y), wxSize(-1, -1), 0, NULL, 0, wxDefaultValidator, buf);
}
+ else if (itemType == "wxComboBox")
+ {
+ prefix = "ID_COMBOBOX";
+ MakeUniqueName("combobox", buf);
+ res->SetName(buf);
+ newItem = new wxComboBox(panel, -1, "", wxPoint(x, y), wxSize(-1, -1), 0, NULL, wxCB_DROPDOWN, wxDefaultValidator, buf);
+ }
else if (itemType == "wxGroupBox" || itemType == "wxStaticBox")
{
- MakeUniqueName("group", buf);
+ prefix = "ID_STATICBOX";
+ MakeUniqueName("staticbox", buf);
res->SetName(buf);
- newItem = new wxStaticBox(panel, -1, "Groupbox", wxPoint(x, y), wxSize(200, 200), 0, buf);
+ newItem = new wxStaticBox(panel, -1, "Static", wxPoint(x, y), wxSize(200, 200), 0, buf);
}
else if (itemType == "wxGauge")
{
+ prefix = "ID_GAUGE";
MakeUniqueName("gauge", buf);
res->SetName(buf);
newItem = new wxGauge(panel, -1, 10, wxPoint(x, y), wxSize(80, 30), wxHORIZONTAL, wxDefaultValidator, buf);
}
else if (itemType == "wxSlider")
{
+ prefix = "ID_SLIDER";
MakeUniqueName("slider", buf);
res->SetName(buf);
newItem = new wxSlider(panel, -1, 1, 1, 10, wxPoint(x, y), wxSize(120, -1), wxHORIZONTAL, wxDefaultValidator, buf);
}
else if (itemType == "wxText" || itemType == "wxTextCtrl (single-line)")
{
+ prefix = "ID_TEXTCTRL";
MakeUniqueName("textctrl", buf);
res->SetName(buf);
res->SetType("wxTextCtrl");
}
else if (itemType == "wxMultiText" || itemType == "wxTextCtrl (multi-line)")
{
+ prefix = "ID_TEXTCTRL";
MakeUniqueName("textctrl", buf);
res->SetName(buf);
res->SetType("wxTextCtrl");
}
else if (itemType == "wxScrollBar")
{
+ prefix = "ID_SCROLLBAR";
MakeUniqueName("scrollbar", buf);
res->SetName(buf);
newItem = new wxScrollBar(panel, -1, wxPoint(x, y), wxSize(140, -1), wxHORIZONTAL, wxDefaultValidator, buf);
if (!newItem)
return FALSE;
+ wxString newIdName;
+ int id = GenerateWindowId(prefix, newIdName);
+ res->SetId(id);
+
+ // This is now guaranteed to be unique, so just add to symbol table
+ m_symbolTable.AddSymbol(newIdName, id);
+
newItem->PushEventHandler(new wxResourceEditorControlHandler(newItem, newItem));
res->SetStyle(newItem->GetWindowStyleFlag());
wxDialog* dialog = new wxDialog;
long oldStyle = item->GetStyle();
bool success = FALSE;
- item->SetStyle(wxDEFAULT_DIALOG_STYLE);
+// item->SetStyle(wxDEFAULT_DIALOG_STYLE);
if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
{
dialog->Centre();
dialog->ShowModal();
success = TRUE;
}
- item->SetStyle(oldStyle);
+// item->SetStyle(oldStyle);
return success;
}
return FALSE;
PossiblyDeleteBitmapResource(res->GetValue4());
}
+ // Remove symbol from table if appropriate
+ if (!IsSymbolUsed(res, res->GetId()))
+ {
+ m_symbolTable.RemoveSymbol(res->GetId());
+ }
+
m_resourceTable.Delete(res->GetName());
delete res;
Modify(TRUE);
{
RemoveSelection(item);
childHandler->SelectItem(FALSE);
+#ifndef __WXGTK__
item->GetParent()->Refresh();
+#endif
}
}
return NULL;
}
+// Is this window identifier symbol in use?
+// Let's assume that we can't have 2 names for the same integer id.
+// Therefore we can tell by the integer id whether the symbol is
+// in use.
+bool wxResourceManager::IsSymbolUsed(wxItemResource* thisResource, wxWindowID id)
+{
+ m_resourceTable.BeginFind();
+ wxNode *node;
+ while (node = m_resourceTable.Next())
+ {
+ wxItemResource *res = (wxItemResource *)node->Data();
+
+ wxString resType(res->GetType());
+ if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
+ {
+ if ((res != thisResource) && (res->GetId() == id))
+ return TRUE;
+
+ wxNode *node1 = res->GetChildren().First();
+ while (node1)
+ {
+ wxItemResource *child = (wxItemResource *)node1->Data();
+ if ((child != thisResource) && (child->GetId() == id))
+ return TRUE;
+ node1 = node1->Next();
+ }
+ }
+ }
+ return FALSE;
+}
+
+// Is this window identifier compatible with the given name? (i.e.
+// does it already exist under a different name)
+bool wxResourceManager::IsIdentifierOK(const wxString& name, wxWindowID id)
+{
+ if (m_symbolTable.SymbolExists(name))
+ {
+ int foundId = m_symbolTable.GetIdForSymbol(name);
+ if (foundId != id)
+ return FALSE;
+ }
+ return TRUE;
+}
+
+// Change all integer ids that match oldId, to newId.
+// This is necessary if an id is changed for one resource - all resources
+// must be changed.
+void wxResourceManager::ChangeIds(int oldId, int newId)
+{
+ m_resourceTable.BeginFind();
+ wxNode *node;
+ while (node = m_resourceTable.Next())
+ {
+ wxItemResource *res = (wxItemResource *)node->Data();
+
+ wxString resType(res->GetType());
+ if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
+ {
+ if (res->GetId() == oldId)
+ res->SetId(newId);
+
+ wxNode *node1 = res->GetChildren().First();
+ while (node1)
+ {
+ wxItemResource *child = (wxItemResource *)node1->Data();
+ if (child->GetId() == oldId)
+ child->SetId(newId);
+
+ node1 = node1->Next();
+ }
+ }
+ }
+}
+
+// If any resource ids were missing (or their symbol was missing),
+// repair them i.e. give them new ids. Returns TRUE if any resource
+// needed repairing.
+bool wxResourceManager::RepairResourceIds()
+{
+ bool repaired = FALSE;
+
+ m_resourceTable.BeginFind();
+ wxNode *node;
+ while (node = m_resourceTable.Next())
+ {
+ wxItemResource *res = (wxItemResource *)node->Data();
+ wxString resType(res->GetType());
+ if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
+ {
+
+ if ( (res->GetId() == 0) || ((res->GetId() > 0) && !m_symbolTable.IdExists(res->GetId())) )
+ {
+ wxString newSymbolName;
+ int newId = GenerateWindowId("ID_DIALOG", newSymbolName) ;
+
+ if (res->GetId() == 0)
+ {
+ res->SetId(newId);
+ m_symbolTable.AddSymbol(newSymbolName, newId);
+ }
+ else
+ {
+ m_symbolTable.AddSymbol(newSymbolName, res->GetId());
+ }
+
+ repaired = TRUE;
+ }
+
+ wxNode *node1 = res->GetChildren().First();
+ while (node1)
+ {
+ wxItemResource *child = (wxItemResource *)node1->Data();
+
+ if ( (child->GetId() == 0) || ((child->GetId() > 0) && !m_symbolTable.IdExists(child->GetId())) )
+ {
+ wxString newSymbolName;
+ int newId = GenerateWindowId("ID_CONTROL", newSymbolName) ;
+
+ if (child->GetId() == 0)
+ {
+ child->SetId(newId);
+ m_symbolTable.AddSymbol(newSymbolName, newId);
+ }
+ else
+ {
+ m_symbolTable.AddSymbol(newSymbolName, child->GetId());
+ }
+
+ repaired = TRUE;
+ }
+
+ node1 = node1->Next();
+ }
+ }
+ }
+ return repaired;
+}
+
+
// 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.
else
{
DisassociateResource(resource);
+ if (win->GetEventHandler() != win)
+ win->PopEventHandler(TRUE);
+
DeleteWindow(win);
newWin = m_resourceTable.CreateItem((wxPanel *)parent, resource);
+ newWin->PushEventHandler(new wxResourceEditorControlHandler((wxControl*) newWin, (wxControl*) newWin));
AssociateResource(resource, newWin);
UpdateResourceList();
}
{
info = new wxChoicePropertyInfo(win);
}
+ else if (win->IsKindOf(CLASSINFO(wxComboBox)))
+ {
+ info = new wxComboBoxPropertyInfo(win);
+ }
else if (win->IsKindOf(CLASSINFO(wxButton)))
{
info = new wxButtonPropertyInfo(win);
}
}
+// Generate a window id and a first stab at a name
+int wxResourceManager::GenerateWindowId(const wxString& prefix, wxString& idName)
+{
+ m_symbolIdCounter ++;
+ while (m_symbolTable.IdExists(m_symbolIdCounter))
+ m_symbolIdCounter ++;
+
+ int nameId = m_symbolIdCounter;
+
+ wxString str;
+ str.Printf("%d", nameId);
+ idName = prefix + str;
+
+ while (m_symbolTable.SymbolExists(idName))
+ {
+ nameId ++;
+ str.Printf("%d", nameId);
+ idName = prefix + str;
+ }
+
+ return m_symbolIdCounter;
+}
+
/*
* Resource editor frame
{
}
-void wxResourceEditorFrame::OnNew(wxCommandEvent& event)
+void wxResourceEditorFrame::OnNew(wxCommandEvent& WXUNUSED(event))
{
manager->New(FALSE);
}
-void wxResourceEditorFrame::OnNewDialog(wxCommandEvent& event)
+void wxResourceEditorFrame::OnNewDialog(wxCommandEvent& WXUNUSED(event))
{
manager->CreateNewPanel();
}
-void wxResourceEditorFrame::OnOpen(wxCommandEvent& event)
+void wxResourceEditorFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
{
manager->New(TRUE);
}
-void wxResourceEditorFrame::OnClear(wxCommandEvent& event)
+void wxResourceEditorFrame::OnClear(wxCommandEvent& WXUNUSED(event))
{
manager->Clear(TRUE, FALSE);
}
-void wxResourceEditorFrame::OnSave(wxCommandEvent& event)
+void wxResourceEditorFrame::OnSave(wxCommandEvent& WXUNUSED(event))
{
manager->Save();
}
-void wxResourceEditorFrame::OnSaveAs(wxCommandEvent& event)
+void wxResourceEditorFrame::OnSaveAs(wxCommandEvent& WXUNUSED(event))
{
manager->SaveAs();
}
-void wxResourceEditorFrame::OnExit(wxCommandEvent& event)
+void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
{
manager->Clear(TRUE, FALSE) ;
this->Close();
}
-void wxResourceEditorFrame::OnAbout(wxCommandEvent& event)
+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);
wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
}
-void wxResourceEditorFrame::OnTest(wxCommandEvent& event)
+void wxResourceEditorFrame::OnTest(wxCommandEvent& WXUNUSED(event))
{
manager->TestCurrentDialog(this);
}
-void wxResourceEditorFrame::OnContents(wxCommandEvent& event)
+void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event))
{
+#ifdef __WXMSW__
wxBeginBusyCursor();
manager->GetHelpController()->LoadFile();
manager->GetHelpController()->DisplayContents();
wxEndBusyCursor();
+#endif
}
-void wxResourceEditorFrame::OnDeleteSelection(wxCommandEvent& event)
+void wxResourceEditorFrame::OnDeleteSelection(wxCommandEvent& WXUNUSED(event))
{
manager->DeleteSelection();
}
-void wxResourceEditorFrame::OnRecreateSelection(wxCommandEvent& event)
+void wxResourceEditorFrame::OnRecreateSelection(wxCommandEvent& WXUNUSED(event))
{
manager->RecreateSelection();
}
m_childWindow->Move(m_marginX + (- x * 10), m_marginY + (- y * 10));
}
-void wxResourceEditorScrolledWindow::OnPaint(wxPaintEvent& event)
+void wxResourceEditorScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event))
{
wxPaintDC dc(this);
*
*/
+#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)
END_EVENT_TABLE()
+#endif
+
EditorToolBar::EditorToolBar(wxFrame *frame, const wxPoint& pos, const wxSize& size,
long style):
wxToolBar(frame, -1, pos, size, style)
}
case TOOLBAR_HELP:
{
+#ifdef __WXMSW__
wxBeginBusyCursor();
manager->GetHelpController()->LoadFile();
manager->GetHelpController()->DisplayContents();
wxEndBusyCursor();
+#endif
break;
}
case TOOLBAR_FORMAT_HORIZ:
else frame->SetStatusText("");
}
-void EditorToolBar::OnPaint(wxPaintEvent& event)
-{
- wxToolBar::OnPaint(event);
-
- wxPaintDC dc(this);
- int w, h;
- GetSize(&w, &h);
- dc.SetPen(wxBLACK_PEN);
- dc.SetBrush(wxTRANSPARENT_BRUSH);
- dc.DrawLine(0, h-1, w, h-1);
-}
-
-
projects / wxWidgets.git / blobdiff