Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes, Makefile.in added

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-09 18:10:50 +00:00
parent e75491071d
commit 7bf07d2635
5 changed files with 44 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/dialoged/src/reseditr.cpp
View File

@@ -54,7 +54,6 @@
#include "edtree.h"
#include "edlist.h"
static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);
wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
#if defined(__WXGTK__) || defined(__WXMOTIF__)
@@ -159,7 +158,7 @@ bool wxResourceManager::Initialize()
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");
@@ -326,7 +325,6 @@ bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent)
}
else
{
wxFrame *fr = m_editorFrame;
if (m_editorFrame->Close())
{
m_editorFrame = NULL;
@@ -2228,9 +2226,9 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc)
}
// 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;