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 5f1b105bbbee592daeacf50070e9cbb3325f5cb5..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__)
+#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__)
+#else

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

-#else
-#error "Unsupported platform."

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


@@ -165,6 +163,8 @@ bool wxResourceManager::Initialize()
 #endif
     
     m_popupMenu = new wxMenu;
 #endif
     
     m_popupMenu = new wxMenu;

+    m_popupMenu->Append(OBJECT_MENU_TITLE, "WIDGET TYPE");
+    m_popupMenu->AppendSeparator();

     m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
     m_popupMenu->Append(OBJECT_MENU_DELETE, "Delete object");
     
     m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
     m_popupMenu->Append(OBJECT_MENU_DELETE, "Delete object");
     


@@ -172,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__)
+#else

         m_bitmapImage = new wxBitmap( wxwin_xpm );
 #endif
     }
         m_bitmapImage = new wxBitmap( wxwin_xpm );
 #endif
     }


@@ -641,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;
 }


@@ -766,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__)
+#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 );


@@ -952,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);
         


@@ -1220,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();

     }
 }
 
     }
 }
 


@@ -1237,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();


@@ -2280,7 +2278,7 @@ void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
 void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     char buf[300];
 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);
 }
 
     wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
 }
 


@@ -2380,7 +2378,7 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc)
         {
             wxString str(res->GetTitle());
             int x, y;
         {
             wxString str(res->GetTitle());
             int x, y;

-            ViewStart(& x, & y);
+            GetViewStart(& x, & y);

             
             wxFont font(10, wxSWISS, wxNORMAL, wxBOLD);
             dc.SetFont(font);
             
             wxFont font(10, wxSWISS, wxNORMAL, wxBOLD);
             dc.SetFont(font);


@@ -2395,34 +2393,6 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc)
     }
 }
 
     }
 }
 

-// Popup menu callback
-void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event)
-{
-    wxWindow *data = (wxWindow *)menu->GetClientData();
-    if (!data)
-        return;
-    
-    switch (event.GetInt())
-    {
-    case OBJECT_MENU_EDIT:
-        {
-            wxResourceManager::GetCurrentResourceManager()->EditWindow(data);
-            break;
-        }
-    case OBJECT_MENU_DELETE:
-        {
-            wxResourceManager::GetCurrentResourceManager()->DeselectItemIfNecessary(data);
-            
-            wxResourceManager::GetCurrentResourceManager()->SaveInfoAndDeleteHandler(data);
-            wxResourceManager::GetCurrentResourceManager()->DeleteResource(data);
-            wxResourceManager::GetCurrentResourceManager()->DeleteWindow(data);
-            break;
-        }
-    default:
-        break;
-    }
-}
-

 /*
 * Main toolbar
 *
 /*
 * Main toolbar
 *


@@ -2885,7 +2855,7 @@ bool wxResourceManager::InsertLabelResource(wxItemResource* parent, wxItemResour
         font = parent->GetFont();
 
     if (!font.Ok() || (parent->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS))
         font = parent->GetFont();
 
     if (!font.Ok() || (parent->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS))

-        font = wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
+        font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);

 
     int labelX, labelY;
     wxCoord labelWidth, labelHeight;
 
     int labelX, labelY;
     wxCoord labelWidth, labelHeight;