X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..8b713759b615fc1530d1f476f37d6d213e7934a5:/src/palmos/dialog.cpp?ds=sidebyside diff --git a/src/palmos/dialog.cpp b/src/palmos/dialog.cpp index 0c869da0c6..248a539145 100644 --- a/src/palmos/dialog.cpp +++ b/src/palmos/dialog.cpp @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: src/palmos/dialog.cpp // Purpose: wxDialog class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/12/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dialog.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,8 +24,9 @@ #pragma hdrstop #endif +#include "wx/dialog.h" + #ifndef WX_PRECOMP - #include "wx/dialog.h" #include "wx/utils.h" #include "wx/frame.h" #include "wx/app.h" @@ -38,7 +35,6 @@ #include "wx/log.h" #endif -#include "wx/log.h" #include "wx/evtloop.h" #include "wx/ptr_scpd.h" @@ -75,10 +71,14 @@ wxBEGIN_FLAGS( wxDialogStyle ) wxFLAGS_MEMBER(wxWS_EX_VALIDATE_RECURSIVELY) wxFLAGS_MEMBER(wxSTAY_ON_TOP) wxFLAGS_MEMBER(wxCAPTION) +#if WXWIN_COMPATIBILITY_2_6 wxFLAGS_MEMBER(wxTHICK_FRAME) +#endif // WXWIN_COMPATIBILITY_2_6 wxFLAGS_MEMBER(wxSYSTEM_MENU) wxFLAGS_MEMBER(wxRESIZE_BORDER) +#if WXWIN_COMPATIBILITY_2_6 wxFLAGS_MEMBER(wxRESIZE_BOX) +#endif // WXWIN_COMPATIBILITY_2_6 wxFLAGS_MEMBER(wxCLOSE_BOX) wxFLAGS_MEMBER(wxMAXIMIZE_BOX) wxFLAGS_MEMBER(wxMINIMIZE_BOX) @@ -105,8 +105,6 @@ BEGIN_EVENT_TABLE(wxDialog, wxDialogBase) EVT_BUTTON(wxID_APPLY, wxDialog::OnApply) EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel) - EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) - EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() @@ -160,23 +158,6 @@ bool wxDialog::Create(wxWindow *parent, return false; } -// deprecated ctor -wxDialog::wxDialog(wxWindow *parent, - const wxString& title, - bool WXUNUSED(modal), - int x, - int y, - int w, - int h, - long style, - const wxString& name) -{ -} - -void wxDialog::SetModal(bool WXUNUSED(flag)) -{ -} - wxDialog::~wxDialog() { } @@ -185,11 +166,6 @@ wxDialog::~wxDialog() // showing the dialogs // ---------------------------------------------------------------------------- -bool wxDialog::IsModalShowing() const -{ - return false; -} - wxWindow *wxDialog::FindSuitableParent() const { return NULL; @@ -234,32 +210,3 @@ void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event)) void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { } - -void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event)) -{ -} - -// --------------------------------------------------------------------------- -// dialog window proc -// --------------------------------------------------------------------------- - -WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) -{ - return false; -} - -#if wxUSE_CTL3D - -// Define for each class of dialog and control -WXHBRUSH wxDialog::OnCtlColor(WXHDC WXUNUSED(pDC), - WXHWND WXUNUSED(pWnd), - WXUINT WXUNUSED(nCtlColor), - WXUINT message, - WXWPARAM wParam, - WXLPARAM lParam) -{ - return (WXHBRUSH)Ctl3dCtlColorEx(message, wParam, lParam); -} - -#endif // wxUSE_CTL3D -