Fixed drawing of the lines data, also ensure that only tuples are

[wxWidgets.git] / utils / dialoged / src / reseditr.cpp

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index d228a23834e11c01017c0833cd2c2052d036db9c..0b9968031ced66a60ba14a13b47df821124c0358 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -58,7 +58,7 @@
 
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#if !defined(__WXMSW__)
 #include "bitmaps/load.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/new.xpm"
@@ -150,11 +150,9 @@ bool wxResourceManager::Initialize()
     windowsDir += "\\dialoged.ini" ;
     
     m_optionsResourceFilename = windowsDir;
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMAC__) && defined(__DARWIN__))
+#else
     wxGetHomeDir( &m_optionsResourceFilename );
     m_optionsResourceFilename += "/.dialogedrc";
-#else
-#error "Unsupported platform."
 #endif
     
     LoadOptions();
@@ -174,8 +172,7 @@ bool wxResourceManager::Initialize()
     {
 #ifdef __WXMSW__
         m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
-#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#else
         m_bitmapImage = new wxBitmap( wxwin_xpm );
 #endif
     }
@@ -643,8 +640,8 @@ bool wxResourceManager::DeleteWindow(wxWindow* win)
     
     win->Destroy();
     
-    if (clearDisplay)
-        m_editorPanel->Clear();
+    //if (clearDisplay)
+    //    m_editorPanel->Clear();
     
     return TRUE;
 }
@@ -768,8 +765,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
     wxBitmap ToolbarCopyHeightBitmap("COPYHEIGHTTOOL");
     wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
     wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");
-#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#else
     wxBitmap ToolbarLoadBitmap( load_xpm );
     wxBitmap ToolbarSaveBitmap( save_xpm);
     wxBitmap ToolbarNewBitmap( new_xpm );
@@ -954,7 +950,7 @@ bool wxResourceManager::Edit(wxItemResource *res)
         wxResourceEditorDialogHandler *handler = new wxResourceEditorDialogHandler(panel, res, panel->GetEventHandler(),
             this);
         
-        panel->LoadFromResource(m_editorPanel, res->GetName(), &m_resourceTable);
+        wxLoadFromResource(panel, m_editorPanel, res->GetName(), &m_resourceTable);
         
         panel->PushEventHandler(handler);
         
@@ -1222,7 +1218,7 @@ void wxResourceManager::ClearCurrentDialog()
         DisassociateResource(m_editorPanel->m_childWindow);
         DeleteWindow(m_editorPanel->m_childWindow);
         m_editorPanel->m_childWindow = NULL;
-        m_editorPanel->Clear();
+        //m_editorPanel->Clear();
     }
 }
 
@@ -1239,7 +1235,7 @@ bool wxResourceManager::TestCurrentDialog(wxWindow* parent)
         
         ResourceEditorDialogTester* dialog = new ResourceEditorDialogTester;
         bool success = FALSE;
-        if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
+        if (wxLoadFromResource(dialog, parent, item->GetName(), & m_resourceTable))
         {
             dialog->Centre();
             dialog->ShowModal();
@@ -2282,7 +2278,7 @@ void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     char buf[300];
-    sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart <julian.smart@ukonline.co.uk>\nJulian Smart (c) 1996-1999", wxDIALOG_EDITOR_VERSION);
+    sprintf(buf, "wxWindows Dialog Editor %.1f\n(c) Julian Smart 1996-1999", wxDIALOG_EDITOR_VERSION);
     wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
 }