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 dde7f0413738a4d6ae6f35cde8af357ecd08d122..0b9968031ced66a60ba14a13b47df821124c0358 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -58,7 +58,7 @@
 
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
 
 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"
 #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;
     windowsDir += "\\dialoged.ini" ;
     
     m_optionsResourceFilename = windowsDir;

-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || (defined(__WXMAC__) && defined(__DARWIN__))
+#else

     wxGetHomeDir( &m_optionsResourceFilename );
     m_optionsResourceFilename += "/.dialogedrc";
     wxGetHomeDir( &m_optionsResourceFilename );
     m_optionsResourceFilename += "/.dialogedrc";

-#else
-#error "Unsupported platform."

 #endif
     
     LoadOptions();
 #endif
     
     LoadOptions();


@@ -174,8 +172,7 @@ bool wxResourceManager::Initialize()
     {
 #ifdef __WXMSW__
         m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
     {
 #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
     }
         m_bitmapImage = new wxBitmap( wxwin_xpm );
 #endif
     }


@@ -643,8 +640,8 @@ bool wxResourceManager::DeleteWindow(wxWindow* win)
     
     win->Destroy();
     
     
     win->Destroy();
     

-    if (clearDisplay)
-        m_editorPanel->Clear();
+    //if (clearDisplay)
+    //    m_editorPanel->Clear();

     
     return TRUE;
 }
     
     return TRUE;
 }


@@ -768,8 +765,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
     wxBitmap ToolbarCopyHeightBitmap("COPYHEIGHTTOOL");
     wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
     wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");
     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 );
     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);
         
         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);
         
         
         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;
         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;
         
         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();
         {
             dialog->Centre();
             dialog->ShowModal();