X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93cf77c076b699e8e0b3b0049bd4f80de15997dd..c18ecb1164f8f8255b03374a15b381d14a096335:/src/stubs/dialog.cpp diff --git a/src/stubs/dialog.cpp b/src/stubs/dialog.cpp index 9b72fb0f69..7d6d99744d 100644 --- a/src/stubs/dialog.cpp +++ b/src/stubs/dialog.cpp @@ -107,10 +107,8 @@ wxDialog::~wxDialog() // By default, pressing escape cancels the dialog void wxDialog::OnCharHook(wxKeyEvent& event) { - if (GetHWND()) + if (event.m_keyCode == WXK_ESCAPE) { - if (event.m_keyCode == WXK_ESCAPE) - { // Behaviour changed in 2.0: we'll send a Cancel message // to the dialog instead of Close. wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); @@ -118,7 +116,6 @@ void wxDialog::OnCharHook(wxKeyEvent& event) GetEventHandler()->ProcessEvent(cancelEvent); return; - } } // We didn't process this event. event.Skip(); @@ -167,20 +164,13 @@ void wxDialog::Centre(int direction) int x_offset,y_offset ; int display_width, display_height; int width, height, x, y; - wxFrame *frame ; - if (direction & wxCENTER_FRAME) + wxWindow *parent = GetParent(); + if ((direction & wxCENTER_FRAME) && parent) { - frame = (wxFrame*)GetParent() ; - if (frame) - { - frame->GetPosition(&x_offset,&y_offset) ; - frame->GetSize(&display_width,&display_height) ; - } + parent->GetPosition(&x_offset,&y_offset) ; + parent->GetSize(&display_width,&display_height) ; } else - frame = NULL ; - - if (frame==NULL) { wxDisplaySize(&display_width, &display_height); x_offset = 0 ; @@ -292,3 +282,6 @@ void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event) Refresh(); } +void wxDialog::Fit() +{ +}