X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27476f7368c891de149723b7d4cf9fb922ce8433..c8b4eea8f23cd90e8b8390f2a742f0f828c57461:/src/os2/dialog.cpp?ds=sidebyside diff --git a/src/os2/dialog.cpp b/src/os2/dialog.cpp index fe94c51472..7a5fd77c65 100644 --- a/src/os2/dialog.cpp +++ b/src/os2/dialog.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// // Name: dialog.cpp // Purpose: wxDialog class -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/14/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) David Webster +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -25,10 +25,6 @@ #include "wx/os2/private.h" #include "wx/log.h" -#if wxUSE_COMMON_DIALOGS -#include -#endif - #define wxDIALOG_DEFAULT_X 300 #define wxDIALOG_DEFAULT_Y 300 @@ -38,7 +34,6 @@ wxWindowList wxModalDialogs; wxWindowList wxModelessWindows; // Frames and modeless dialogs extern wxList WXDLLEXPORT wxPendingDelete; -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel) BEGIN_EVENT_TABLE(wxDialog, wxPanel) @@ -50,7 +45,6 @@ extern wxList WXDLLEXPORT wxPendingDelete; EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged) EVT_CLOSE(wxDialog::OnCloseWindow) END_EVENT_TABLE() -#endif wxDialog::wxDialog() { @@ -116,11 +110,11 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, // otherwise it would look too strange) // const wxChar *dlg; // if ( style & wxRESIZE_BORDER ) -// dlg = T("wxResizeableDialog"); +// dlg = wxT("wxResizeableDialog"); // else if ( style & wxCAPTION ) -// dlg = T("wxCaptionDialog"); +// dlg = wxT("wxCaptionDialog"); // else -// dlg = T("wxNoCaptionDialog"); +// dlg = wxT("wxNoCaptionDialog"); // MSWCreate(m_windowId, parent, NULL, this, NULL, // x, y, width, height, // 0, // style is not used if we have dlg template @@ -131,7 +125,7 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id, // // if ( !hwnd ) // { -// wxLogError(T("Failed to create dialog.")); +// wxLogError(wxT("Failed to create dialog.")); // // return FALSE; // }