// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
+// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dialog.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#include "wx/dialog.h"
+
#ifndef WX_PRECOMP
- #include "wx/dialog.h"
+ #include "wx/msw/wrapcdlg.h"
#include "wx/utils.h"
#include "wx/frame.h"
#include "wx/app.h"
+ #include "wx/button.h"
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/log.h"
+ #include "wx/toolbar.h"
#endif
#include "wx/msw/private.h"
-#include "wx/log.h"
+#include "wx/evtloop.h"
+#include "wx/scopedptr.h"
-#if wxUSE_COMMON_DIALOGS
- #include <commdlg.h>
-#endif
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ #include "wx/msw/wince/resources.h"
+#endif // __SMARTPHONE__ && __WXWINCE__
// ----------------------------------------------------------------------------
-// constants
+// wxWin macros
// ----------------------------------------------------------------------------
-// default dialog pos and size
-
-#define wxDIALOG_DEFAULT_X 300
-#define wxDIALOG_DEFAULT_Y 300
-
-#define wxDIALOG_DEFAULT_WIDTH 500
-#define wxDIALOG_DEFAULT_HEIGHT 500
-
// ----------------------------------------------------------------------------
-// globals
+// wxDialogModalData
// ----------------------------------------------------------------------------
-// all objects to be deleted during next idle processing - from window.cpp
-extern wxList WXDLLEXPORT wxPendingDelete;
-
-// all frames and modeless dialogs - not static, used in frame.cpp, mdi.cpp &c
-wxWindowList wxModelessWindows;
-
-// all modal dialogs currently shown
-static wxWindowList wxModalDialogs;
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+// this is simply a container for any data we need to implement modality which
+// allows us to avoid changing wxDialog each time the implementation changes
+class wxDialogModalData
+{
+public:
+ wxDialogModalData(wxDialog *dialog) : m_evtLoop(dialog) { }
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
- EVT_BUTTON(wxID_OK, wxDialog::OnOK)
- EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
- EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
+ void RunLoop()
+ {
+ m_evtLoop.Run();
+ }
- EVT_CHAR_HOOK(wxDialog::OnCharHook)
+ void ExitLoop()
+ {
+ m_evtLoop.Exit();
+ }
- EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
+private:
+ wxModalEventLoop m_evtLoop;
+};
- EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxDialogModalData)
// ============================================================================
// implementation
void wxDialog::Init()
{
- m_oldFocus = (wxWindow *)NULL;
-
- m_isShown = FALSE;
-
- m_windowDisabler = (wxWindowDisabler *)NULL;
-
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+ m_isShown = false;
+ m_modalData = NULL;
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ m_dialogToolBar = NULL;
+#endif
+#if wxUSE_DIALOG_SIZEGRIP
+ m_hGripper = 0;
+#endif // wxUSE_DIALOG_SIZEGRIP
}
bool wxDialog::Create(wxWindow *parent,
long style,
const wxString& name)
{
- Init();
-
- m_oldFocus = FindFocus();
-
- SetName(name);
-
- wxTopLevelWindows.Append(this);
-
- if ( parent )
- parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = (int)NewControlId();
- else
- m_windowId = id;
-
- int x = pos.x;
- int y = pos.y;
- int width = size.x;
- int height = size.y;
-
- if (x < 0)
- x = wxDIALOG_DEFAULT_X;
- if (y < 0)
- y = wxDIALOG_DEFAULT_Y;
-
- m_windowStyle = style;
-
- if (width < 0)
- width = wxDIALOG_DEFAULT_WIDTH;
- if (height < 0)
- height = wxDIALOG_DEFAULT_HEIGHT;
+ SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
// All dialogs should really have this style
- m_windowStyle |= wxTAB_TRAVERSAL;
-
- WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
- if (m_windowStyle & wxSTAY_ON_TOP)
- extendedStyle |= WS_EX_TOPMOST;
-
-#ifndef __WIN16__
- if (m_exStyle & wxDIALOG_EX_CONTEXTHELP)
- extendedStyle |= WS_EX_CONTEXTHELP;
-#endif
+ style |= wxTAB_TRAVERSAL;
- // Allows creation of dialogs with & without captions under MSWindows,
- // resizeable or not (but a resizeable dialog always has caption -
- // otherwise it would look too strange)
- const wxChar *dlg;
- if ( style & wxRESIZE_BORDER )
- dlg = wxT("wxResizeableDialog");
- else if ( style & wxCAPTION )
- dlg = wxT("wxCaptionDialog");
- else
- dlg = wxT("wxNoCaptionDialog");
-
-#ifdef __WXMICROWIN__
- extern const wxChar *wxFrameClassName;
-
- int msflags = WS_OVERLAPPED|WS_POPUP;
- if (style & wxCAPTION)
- msflags |= WS_CAPTION;
- if (style & wxCLIP_CHILDREN)
- msflags |= WS_CLIPCHILDREN;
- if ((style & wxTHICK_FRAME) == 0)
- msflags |= WS_BORDER;
- MSWCreate(m_windowId, parent, wxFrameClassName, this, NULL,
- x, y, width, height,
- msflags,
- NULL,
- extendedStyle);
-
-#else
- MSWCreate(m_windowId, parent, NULL, this, NULL,
- x, y, width, height,
- 0, // style is not used if we have dlg template
- dlg,
- extendedStyle);
-#endif
- HWND hwnd = (HWND)GetHWND();
-
- if ( !hwnd )
- {
- wxFAIL_MSG(_("Failed to create dialog. You probably forgot to include wx/msw/wx.rc in your resources."));
+ if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+ return false;
- return FALSE;
- }
+ if ( !m_hasFont )
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
-#ifndef __WXMICROWIN__
- SubclassWin(GetHWND());
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ SetLeftMenu(wxID_OK, _("OK"));
#endif
-
- SetWindowText(hwnd, title);
-
- return TRUE;
-}
-
-bool wxDialog::EnableCloseButton(bool enable)
-{
-#ifndef __WXMICROWIN__
- // get system (a.k.a. window) menu
- HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
- if ( !hmenu )
- {
- wxLogLastError(_T("GetSystemMenu"));
-
- return FALSE;
- }
-
- // enabling/disabling the close item from it also automatically
- // disables/enabling the close title bar button
- if ( !::EnableMenuItem(hmenu, SC_CLOSE,
- MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
- {
- wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
-
- return FALSE;
- }
-
- // update appearance immediately
- if ( !::DrawMenuBar(GetHwnd()) )
- {
- wxLogLastError(_T("DrawMenuBar"));
- }
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ CreateToolBar();
#endif
-
- return TRUE;
-}
-void wxDialog::SetModal(bool flag)
-{
- if ( flag )
+#if wxUSE_DIALOG_SIZEGRIP
+ if ( HasFlag(wxRESIZE_BORDER) )
{
- m_windowStyle |= wxDIALOG_MODAL;
+ CreateGripper();
- wxModelessWindows.DeleteObject(this);
+ Connect(wxEVT_CREATE,
+ wxWindowCreateEventHandler(wxDialog::OnWindowCreate));
}
- else
- {
- m_windowStyle &= ~wxDIALOG_MODAL;
+#endif // wxUSE_DIALOG_SIZEGRIP
- wxModelessWindows.Append(this);
- }
+ return true;
}
wxDialog::~wxDialog()
{
- m_isBeingDeleted = TRUE;
-
- wxTopLevelWindows.DeleteObject(this);
-
// this will also reenable all the other windows for a modal dialog
- Show(FALSE);
-
- if ( !IsModal() )
- wxModelessWindows.DeleteObject(this);
-
- // If this is the last top-level window, exit.
- if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
- {
- wxTheApp->SetTopWindow(NULL);
+ Show(false);
- if ( wxTheApp->GetExitOnFrameDelete() )
- {
- ::PostQuitMessage(0);
- }
- }
+#if wxUSE_DIALOG_SIZEGRIP
+ DestroyGripper();
+#endif // wxUSE_DIALOG_SIZEGRIP
}
// ----------------------------------------------------------------------------
-// kbd handling
+// showing the dialogs
// ----------------------------------------------------------------------------
-// By default, pressing escape cancels the dialog
-void wxDialog::OnCharHook(wxKeyEvent& event)
+bool wxDialog::Show(bool show)
{
- if (GetHWND())
+ if ( show == IsShown() )
+ return false;
+
+ if ( !show && m_modalData )
{
- // "Esc" works as an accelerator for the "Cancel" button, but it
- // shouldn't close the dialog which doesn't have any cancel button
- if ( (event.m_keyCode == WXK_ESCAPE) && FindWindow(wxID_CANCEL) )
- {
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent);
+ // we need to do this before calling wxDialogBase version because if we
+ // had disabled other app windows, they must be reenabled right now as
+ // if they stay disabled Windows will activate another window (one
+ // which is enabled, anyhow) when we're hidden in the base class Show()
+ // and we will lose activation
+ m_modalData->ExitLoop();
+ }
- // ensure that there is another message for this window so the
- // ShowModal loop will exit and won't get stuck in GetMessage().
- ::PostMessage(GetHwnd(), WM_NULL, 0, 0);
+ if ( show )
+ {
+ if (CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
- return;
- }
+ // this usually will result in TransferDataToWindow() being called
+ // which will change the controls values so do it before showing as
+ // otherwise we could have some flicker
+ InitDialog();
}
- // We didn't process this event.
- event.Skip();
-}
-
-// ----------------------------------------------------------------------------
-// Windows dialog boxes can't be iconized
-// ----------------------------------------------------------------------------
+ wxDialogBase::Show(show);
-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-}
+ if ( show )
+ {
+ // dialogs don't get WM_SIZE message from ::ShowWindow() for some
+ // reason so generate it ourselves for consistency with frames and
+ // dialogs in other ports
+ //
+ // NB: normally we should call it just the first time but doing it
+ // every time is simpler than keeping a flag
+ const wxSize size = GetClientSize();
+ ::SendMessage(GetHwnd(), WM_SIZE,
+ SIZE_RESTORED, MAKELPARAM(size.x, size.y));
+ }
-bool wxDialog::IsIconized() const
-{
- return FALSE;
+ return true;
}
-// ----------------------------------------------------------------------------
-// size/position handling
-// ----------------------------------------------------------------------------
-
-void wxDialog::DoSetClientSize(int width, int height)
+// show dialog modally
+int wxDialog::ShowModal()
{
- HWND hWnd = (HWND) GetHWND();
- RECT rect;
- ::GetClientRect(hWnd, &rect);
-
- RECT rect2;
- GetWindowRect(hWnd, &rect2);
+ wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );
- // Find the difference between the entire window (title bar and all)
- // and the client area; add this to the new client size to move the
- // window
- int actual_width = rect2.right - rect2.left - rect.right + width;
- int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
+ Show();
- MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
+ // EndModal may have been called from InitDialog handler (called from
+ // inside Show()) and hidden the dialog back again
+ if ( IsShown() )
+ {
+ // enter and run the modal loop
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
+ }
- wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
+ return GetReturnCode();
}
-void wxDialog::DoGetPosition(int *x, int *y) const
+void wxDialog::EndModal(int retCode)
{
- RECT rect;
- GetWindowRect(GetHwnd(), &rect);
+ wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );
- if ( x )
- *x = rect.left;
- if ( y )
- *y = rect.top;
+ SetReturnCode(retCode);
+
+ Hide();
}
// ----------------------------------------------------------------------------
-// showing the dialogs
+// wxDialog gripper handling
// ----------------------------------------------------------------------------
-bool wxDialog::IsModal() const
-{
- return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
-}
+#if wxUSE_DIALOG_SIZEGRIP
-bool wxDialog::IsModalShowing() const
+void wxDialog::SetWindowStyleFlag(long style)
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ wxDialogBase::SetWindowStyleFlag(style);
+
+ if ( HasFlag(wxRESIZE_BORDER) )
+ CreateGripper();
+ else
+ DestroyGripper();
}
-void wxDialog::DoShowModal()
+void wxDialog::CreateGripper()
{
- wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
- wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
-
- wxModalDialogs.Append(this);
-
- wxWindow *parent = GetParent();
-
- wxWindow* oldFocus = m_oldFocus;
-
- // We have to remember the HWND because we need to check
- // the HWND still exists (oldFocus can be garbage when the dialog
- // exits, if it has been destroyed)
- HWND hwndOldFocus = 0;
- if (oldFocus)
- hwndOldFocus = (HWND) oldFocus->GetHWND();
-
- // remember where the focus was
- if ( !oldFocus )
- {
- oldFocus = parent;
- if ( parent )
- hwndOldFocus = GetHwndOf(parent);
- }
-
- // disable all other app windows
- wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
-
- m_windowDisabler = new wxWindowDisabler(this);
-
- // enter the modal loop
- while ( IsModalShowing() )
- {
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
-
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- ;
-
- // a message came or no more idle processing to do
- wxTheApp->DoMessage();
- }
-
- // and restore focus
- // Note that this code MUST NOT access the dialog object's data
- // in case the object has been deleted (which will be the case
- // for a modal dialog that has been destroyed before calling EndModal).
- if ( oldFocus && (oldFocus != this) && ::IsWindow(hwndOldFocus))
+ if ( !m_hGripper )
{
- // This is likely to prove that the object still exists
- if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
- oldFocus->SetFocus();
+ // just create it here, it will be positioned and shown later
+ m_hGripper = (WXHWND)::CreateWindow
+ (
+ wxT("SCROLLBAR"),
+ wxT(""),
+ WS_CHILD |
+ WS_CLIPSIBLINGS |
+ SBS_SIZEGRIP |
+ SBS_SIZEBOX |
+ SBS_SIZEBOXBOTTOMRIGHTALIGN,
+ 0, 0, 0, 0,
+ GetHwnd(),
+ 0,
+ wxGetInstance(),
+ NULL
+ );
}
}
-bool wxDialog::Show(bool show)
+void wxDialog::DestroyGripper()
{
- if ( !show )
+ if ( m_hGripper )
{
- // if we had disabled other app windows, reenable them back now because
- // if they stay disabled Windows will activate another window (one
- // which is enabled, anyhow) and we will lose activation
- if ( m_windowDisabler )
- {
- delete m_windowDisabler;
- m_windowDisabler = NULL;
- }
+ // we used to have trouble with gripper appearing on top (and hence
+ // overdrawing) the other, real, dialog children -- check that this
+ // isn't the case automatically (but notice that this could be false if
+ // we're not shown at all as in this case ResizeGripper() might not
+ // have been called yet)
+ wxASSERT_MSG( !IsShown() ||
+ ::GetWindow((HWND)m_hGripper, GW_HWNDNEXT) == 0,
+ wxT("Bug in wxWidgets: gripper should be at the bottom of Z-order") );
+ ::DestroyWindow((HWND) m_hGripper);
+ m_hGripper = 0;
}
+}
- // ShowModal() may be called for already shown dialog
- if ( !wxDialogBase::Show(show) && !(show && IsModal()) )
- {
- // nothing to do
- return FALSE;
- }
+void wxDialog::ShowGripper(bool show)
+{
+ wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );
if ( show )
- {
- // usually will result in TransferDataToWindow() being called
- InitDialog();
- }
-
- if ( IsModal() )
- {
- if ( show )
- {
- // modal dialog needs a parent window, so try to find one
- if ( !GetParent() )
- {
- wxWindow *parent = wxTheApp->GetTopWindow();
- if ( parent && parent != this && parent->IsShown() )
- {
- // use it
- m_parent = parent;
-
- // VZ: to make dialog behave properly we should reparent
- // the dialog for Windows as well - unfortunately,
- // following the docs for SetParent() results in this
- // code which plainly doesn't work
-#if 0
- long dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
- dwStyle &= ~WS_POPUP;
- dwStyle |= WS_CHILD;
- ::SetWindowLong(GetHwnd(), GWL_STYLE, dwStyle);
- ::SetParent(GetHwnd(), GetHwndOf(parent));
-#endif // 0
- }
- }
-
- DoShowModal();
- }
- else // end of modal dialog
- {
- // this will cause IsModalShowing() return FALSE and our local
- // message loop will terminate
- wxModalDialogs.DeleteObject(this);
- }
- }
+ ResizeGripper();
- return TRUE;
+ ::ShowWindow((HWND)m_hGripper, show ? SW_SHOW : SW_HIDE);
}
-// a special version for Show(TRUE) for modal dialogs which returns return code
-int wxDialog::ShowModal()
+void wxDialog::ResizeGripper()
{
- if ( !IsModal() )
- {
- SetModal(TRUE);
- }
+ wxASSERT_MSG( m_hGripper, wxT("shouldn't be called if we have no gripper") );
- Show(TRUE);
+ HWND hwndGripper = (HWND)m_hGripper;
- return GetReturnCode();
+ const wxRect rectGripper = wxRectFromRECT(wxGetWindowRect(hwndGripper));
+ const wxSize size = GetClientSize() - rectGripper.GetSize();
+
+ ::SetWindowPos(hwndGripper, HWND_BOTTOM,
+ size.x, size.y,
+ rectGripper.width, rectGripper.height,
+ SWP_NOACTIVATE);
}
-// NB: this function (surprizingly) may be called for both modal and modeless
-// dialogs and should work for both of them
-void wxDialog::EndModal(int retCode)
+void wxDialog::OnWindowCreate(wxWindowCreateEvent& event)
{
- SetReturnCode(retCode);
+ if ( m_hGripper && IsShown() &&
+ event.GetWindow() && event.GetWindow()->GetParent() == this )
+ {
+ // Put gripper below the newly created child window
+ ::SetWindowPos((HWND)m_hGripper, HWND_BOTTOM, 0, 0, 0, 0,
+ SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE);
+ }
- Show(FALSE);
+ event.Skip();
}
+#endif // wxUSE_DIALOG_SIZEGRIP
+
// ----------------------------------------------------------------------------
// wxWin event handlers
// ----------------------------------------------------------------------------
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
- if ( Validate() && TransferDataFromWindow() )
- {
- EndModal(wxID_OK);
- }
-}
-
-void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
+#ifdef __POCKETPC__
+// Responds to the OK button in a PocketPC titlebar. This
+// can be overridden, or you can change the id used for
+// sending the event, by calling SetAffirmativeId.
+bool wxDialog::DoOK()
{
- if ( Validate() )
- TransferDataFromWindow();
+ const int idOk = GetAffirmativeId();
+ if ( EmulateButtonClickIfPresent(idOk) )
+ return true;
- // TODO probably need to disable the Apply button until things change again
-}
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+ event.SetEventObject(this);
-void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
- EndModal(wxID_CANCEL);
+ return HandleWindowEvent(event);
}
+#endif // __POCKETPC__
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+// create main toolbar by calling OnCreateToolBar()
+wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name)
{
- // We'll send a Cancel message by default, which may close the dialog.
- // Check for looping if the Cancel event handler calls Close().
-
- // Note that if a cancel button and handler aren't present in the dialog,
- // nothing will happen when you close the dialog via the window manager, or
- // via Close(). We wouldn't want to destroy the dialog by default, since
- // the dialog may have been created on the stack. However, this does mean
- // that calling dialog->Close() won't delete the dialog unless the handler
- // for wxID_CANCEL does so. So use Destroy() if you want to be sure to
- // destroy the dialog. The default OnCancel (above) simply ends a modal
- // dialog, and hides a modeless dialog.
-
- // VZ: this is horrible and MT-unsafe. Can't we reuse some of these global
- // lists here? don't dare to change it now, but should be done later!
- static wxList closing;
+ m_dialogToolBar = OnCreateToolBar(style, winid, name);
- if ( closing.Member(this) )
- return;
-
- closing.Append(this);
-
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
-
- closing.DeleteObject(this);
+ return m_dialogToolBar;
}
-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
+// return a new toolbar
+wxToolBar *wxDialog::OnCreateToolBar(long style,
+ wxWindowID winid,
+ const wxString& name)
{
- wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
- _T("wxDialog destroyed twice") );
-
- wxPendingDelete.Append(this);
-
- return TRUE;
+ return new wxToolMenuBar(this, winid,
+ wxDefaultPosition, wxDefaultSize,
+ style, name);
}
-
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
-#if wxUSE_CTL3D
- Ctl3dColorChange();
-#else
- SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
- Refresh();
#endif
-}
// ---------------------------------------------------------------------------
-// dialog window proc
+// dialog Windows messages processing
// ---------------------------------------------------------------------------
-long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
- long rc = 0;
- bool processed = FALSE;
+ WXLRESULT rc = 0;
+ bool processed = false;
switch ( message )
{
-#if 0 // now that we got owner window right it doesn't seem to be needed
- case WM_ACTIVATE:
+#ifdef __WXWINCE__
+ // react to pressing the OK button in the title
+ case WM_COMMAND:
+ {
switch ( LOWORD(wParam) )
{
- case WA_ACTIVE:
- case WA_CLICKACTIVE:
- if ( IsModalShowing() && GetParent() )
- {
- // bring the owner window to top as the standard dialog
- // boxes do
- if ( !::SetWindowPos
- (
- GetHwndOf(GetParent()),
- GetHwnd(),
- 0, 0,
- 0, 0,
- SWP_NOACTIVATE |
- SWP_NOMOVE |
- SWP_NOSIZE
- ) )
- {
- wxLogLastError(wxT("SetWindowPos(SWP_NOACTIVATE)"));
- }
- }
- // fall through to process it normally as well
+#ifdef __POCKETPC__
+ case IDOK:
+ processed = DoOK();
+ if (!processed)
+ processed = !Close();
+#endif
+#ifdef __SMARTPHONE__
+ case IDM_LEFT:
+ case IDM_RIGHT:
+ processed = HandleCommand( LOWORD(wParam) , 0 , NULL );
+ break;
+#endif // __SMARTPHONE__
}
break;
-#endif // 0
-
+ }
+#endif
case WM_CLOSE:
// if we can't close, tell the system that we processed the
// message - otherwise it would close us
processed = !Close();
break;
+ case WM_SIZE:
+#if wxUSE_DIALOG_SIZEGRIP
+ if ( m_hGripper )
+ {
+ switch ( wParam )
+ {
+ case SIZE_MAXIMIZED:
+ ShowGripper(false);
+ break;
+
+ case SIZE_RESTORED:
+ ShowGripper(true);
+ }
+ }
+#endif // wxUSE_DIALOG_SIZEGRIP
+
+ // the Windows dialogs unfortunately are not meant to be resizable
+ // at all and their standard class doesn't include CS_[VH]REDRAW
+ // styles which means that the window is not refreshed properly
+ // after the resize and no amount of WS_CLIPCHILDREN/SIBLINGS can
+ // help with it - so we have to refresh it manually which certainly
+ // creates flicker but at least doesn't show garbage on the screen
+ rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+ processed = true;
+ if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) )
+ {
+ ::InvalidateRect(GetHwnd(), NULL, false /* erase bg */);
+ }
+ break;
+
#ifndef __WXMICROWIN__
case WM_SETCURSOR:
// we want to override the busy cursor for modal dialogs:
// typically, wxBeginBusyCursor() is called and then a modal dialog
// is shown, but the modal dialog shouldn't have hourglass cursor
- if ( IsModalShowing() && wxIsBusy() )
+ if ( IsModal() && wxIsBusy() )
{
// set our cursor for all windows (but see below)
wxCursor cursor = m_cursor;
- if ( !cursor.Ok() )
+ if ( !cursor.IsOk() )
cursor = wxCURSOR_ARROW;
::SetCursor(GetHcursorOf(cursor));
// in any case, stop here and don't let wxWindow process this
// message (it would set the busy cursor)
- processed = TRUE;
+ processed = true;
- // but return FALSE to tell the child window (if the event
+ // but return false to tell the child window (if the event
// comes from one of them and not from ourselves) that it can
// set its own cursor if it has one: thus, standard controls
// (e.g. text ctrl) still have correct cursors in a dialog
// invoked while wxIsBusy()
- rc = FALSE;
+ rc = false;
}
break;
-#endif
+#endif // __WXMICROWIN__
}
if ( !processed )
return rc;
}
-
-#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
-
projects / wxWidgets.git / blobdiff