compilation fixes, Makefile.in added

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/dialoged/src/Makefile.in b/utils/dialoged/src/Makefile.in
new file mode 100644 (file)
index 0000000..51c3fdb
--- /dev/null
+++ b/utils/dialoged/src/Makefile.in
@@ -0,0 +1,21 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1998
+# Updated:     
+# Copyright:   (c) 1998 Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile for Tex2RTF (Unix)
+
+top_srcdir = @top_srcdir@
+top_builddir = ../../..
+program_dir = utils/dialoged/src
+
+PROGRAM=DialogEd
+
+OBJECTS = dialoged.o dlghndlr.o edlist.o edtree.o reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o
+
+include ../../../src/makeprog.env
+

diff --git a/utils/dialoged/src/dialoged.cpp b/utils/dialoged/src/dialoged.cpp
index 21029951717df7f1ef7d0c6837a2ce6f13008714..776852971dc19817ed9f273166cb85488b1f29e6 100644 (file)
--- a/utils/dialoged/src/dialoged.cpp
+++ b/utils/dialoged/src/dialoged.cpp
@@ -27,6 +27,11 @@
 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

+BEGIN_EVENT_TABLE(MyApp, wxApp)
+    EVT_MENU(OBJECT_MENU_EDIT, MyApp::OnObjectPopupMenu)
+    EVT_MENU(OBJECT_MENU_DELETE, MyApp::OnObjectPopupMenu)
+END_EVENT_TABLE()
+

 MyApp::MyApp(void)
 {
 }
 MyApp::MyApp(void)
 {
 }

diff --git a/utils/dialoged/src/dialoged.h b/utils/dialoged/src/dialoged.h
index adfcb9ace9672ddecdb1d47597990875f86beb64..fae9807806bba9e76eae1cf36974fab5491020fe 100644 (file)
--- a/utils/dialoged/src/dialoged.h
+++ b/utils/dialoged/src/dialoged.h
@@ -19,6 +19,8 @@
 #include "wx/proplist.h"
 #include "reseditr.h"
 
 #include "wx/proplist.h"
 #include "reseditr.h"
 

+extern void ObjectMenuProc(wxMenu *menu, wxCommandEvent& event);
+

 class MyChild;
 
 // Define a new application
 class MyChild;
 
 // Define a new application


@@ -28,6 +30,14 @@ class MyApp: public wxApp
     MyApp(void);
     bool OnInit(void);
     int OnExit(void);
     MyApp(void);
     bool OnInit(void);
     int OnExit(void);

+
+    void OnObjectPopupMenu(wxCommandEvent& event)
+    {
+        return ObjectMenuProc((wxMenu *)event.GetEventObject(), event);
+    }
+
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 DECLARE_APP(MyApp)
 };
 
 DECLARE_APP(MyApp)

diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp
index 794043ecb0650916a0eed44a2348ef07f77a713f..721af4b4b0de206c751a8d75397636562af821c8 100644 (file)
--- a/utils/dialoged/src/dlghndlr.cpp
+++ b/utils/dialoged/src/dlghndlr.cpp
@@ -331,8 +331,8 @@ void wxResourceEditorDialogHandler::OnMouseEvent(wxMouseEvent& event)
       return;
     }
   
       return;
     }
   

-    long x, y;
-    event.Position(&x, &y);
+    wxCoord x, y;
+    event.GetPosition(&x, &y);

 
     // Find which selection handle we're on, if any
     wxNode *node = handlerDialog->GetChildren().First();
 
     // Find which selection handle we're on, if any
     wxNode *node = handlerDialog->GetChildren().First();


@@ -401,7 +401,7 @@ void wxResourceEditorDialogHandler::OnItemEvent(wxControl *item, wxMouseEvent& e
 
   // Not a selection handle event: just a normal item event.
   // Transform to panel coordinates.
 
   // Not a selection handle event: just a normal item event.
   // Transform to panel coordinates.

-  int x, y;
+  wxCoord x, y;

   item->GetPosition(&x, &y);
 
   event.m_x = event.m_x + x;
   item->GetPosition(&x, &y);
 
   event.m_x = event.m_x + x;


@@ -414,8 +414,8 @@ void wxResourceEditorDialogHandler::ProcessItemEvent(wxControl *item, wxMouseEve
 {
   wxResourceEditorControlHandler *childHandler = (wxResourceEditorControlHandler *)item->GetEventHandler();
   
 {
   wxResourceEditorControlHandler *childHandler = (wxResourceEditorControlHandler *)item->GetEventHandler();
   

-  long x, y;
-  event.Position(&x, &y);
+  wxCoord x, y;
+  event.GetPosition(&x, &y);

   int keys = 0;
   if (event.ShiftDown()) keys = keys | wxKEY_SHIFT;
   if (event.ControlDown()) keys = keys | wxKEY_CTRL;
   int keys = 0;
   if (event.ShiftDown()) keys = keys | wxKEY_SHIFT;
   if (event.ControlDown()) keys = keys | wxKEY_CTRL;

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 069cbfbfae853690fd8e1ae56986c3c063ef632a..cd539913b8713ee52b8d2e016d0433cdf67d8335 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -54,7 +54,6 @@
 #include "edtree.h"
 #include "edlist.h"
 
 #include "edtree.h"
 #include "edlist.h"
 

-static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);

 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
 #if defined(__WXGTK__) || defined(__WXMOTIF__)


@@ -159,7 +158,7 @@ bool wxResourceManager::Initialize()
   m_helpController->Initialize("dialoged");
 #endif
 
   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");
 
   m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
   m_popupMenu->Append(OBJECT_MENU_DELETE, "Delete object");
 


@@ -326,7 +325,6 @@ bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent)
   }
   else
   {
   }
   else
   {

-    wxFrame *fr = m_editorFrame;

     if (m_editorFrame->Close())
     {
       m_editorFrame = NULL;
     if (m_editorFrame->Close())
     {
       m_editorFrame = NULL;


@@ -2228,9 +2226,9 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc)
 }
 
 // Popup menu callback
 }
 
 // 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;
 
   if (!data)
     return;