After resolving all conflicts that came down the
telephone line: DialogEd is ready for general consumption now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -371,13 +371,16 @@ void wxResourceEditorDialogHandler::OnItemEvent(wxControl *item, wxMouseEvent& e
|
||||
|
||||
event.m_x = event.m_x + x;
|
||||
event.m_y = event.m_y + y;
|
||||
|
||||
ProcessItemEvent(item, event, dragType);
|
||||
}
|
||||
|
||||
void wxResourceEditorDialogHandler::ProcessItemEvent(wxControl *item, wxMouseEvent& event, int selectionHandle)
|
||||
{
|
||||
wxResourceEditorControlHandler *childHandler = (wxResourceEditorControlHandler *)item->GetEventHandler();
|
||||
|
||||
|
||||
if (dragItem) childHandler = (wxResourceEditorControlHandler *)dragItem->GetEventHandler();
|
||||
|
||||
long x, y;
|
||||
event.Position(&x, &y);
|
||||
int keys = 0;
|
||||
|
@@ -150,13 +150,8 @@ bool wxResourceManager::Initialize()
|
||||
strcat(buf, "\\dialoged.ini");
|
||||
m_optionsResourceFilename = buf;
|
||||
#elif defined(__WXGTK__)
|
||||
/*
|
||||
wxString buf;
|
||||
wxGetHomeDir(&buf);
|
||||
buf += "/.dialogedrc";
|
||||
m_optionsResourceFilename = buf;
|
||||
*/
|
||||
m_optionsResourceFilename = ".dialoged.rc";
|
||||
wxGetHomeDir( &m_optionsResourceFilename );
|
||||
m_optionsResourceFilename += "/.dialogedrc";
|
||||
#else
|
||||
#error "Unsupported platform."
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user