// 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 && !defined(__WXMICROWIN__)
- #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
-// ----------------------------------------------------------------------------
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxDialogStyle )
+
+wxBEGIN_FLAGS( wxDialogStyle )
+ // new style border flags, we put them first to
+ // use them for streaming out
+ wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+ wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+ wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+ wxFLAGS_MEMBER(wxBORDER_RAISED)
+ wxFLAGS_MEMBER(wxBORDER_STATIC)
+ wxFLAGS_MEMBER(wxBORDER_NONE)
+
+ // old style border flags
+ wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+ wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+ wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+ wxFLAGS_MEMBER(wxRAISED_BORDER)
+ wxFLAGS_MEMBER(wxSTATIC_BORDER)
+ wxFLAGS_MEMBER(wxNO_BORDER)
+
+ // standard window styles
+ wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+ wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+
+ // dialog styles
+ 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)
+wxEND_FLAGS( wxDialogStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxDialog, wxTopLevelWindow,"wx/dialog.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxDialog)
+ wxPROPERTY( Title, wxString, SetTitle, GetTitle, wxString() , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+ wxPROPERTY_FLAGS( WindowStyle , wxDialogStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxDialog)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
-// all modal dialogs currently shown
-static wxWindowList wxModalDialogs;
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+#endif
// ----------------------------------------------------------------------------
-// wxWin macros
+// wxDialogModalData
// ----------------------------------------------------------------------------
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
+// 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, wxDialogBase)
- 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::GetColour(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();
-
SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
- // save focus before doing anything which can potentially change it
- m_oldFocus = FindFocus();
-
// All dialogs should really have this style
style |= wxTAB_TRAVERSAL;
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
+ return false;
- SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
+ if ( !m_hasFont )
+ SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- return TRUE;
-}
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ SetLeftMenu(wxID_OK, _("OK"));
+#endif
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ CreateToolBar();
+#endif
-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;
-
// this will also reenable all the other windows for a modal dialog
- Show(FALSE);
+ Show(false);
+
+#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();
-}
+ wxDialogBase::Show(show);
-// ----------------------------------------------------------------------------
-// showing the dialogs
-// ----------------------------------------------------------------------------
+ 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::IsModal() const
-{
- return (GetWindowStyleFlag() & wxDIALOG_MODAL) != 0;
+ return true;
}
-bool wxDialog::IsModalShowing() const
+void wxDialog::Raise()
{
- return wxModalDialogs.Find((wxDialog *)this) != NULL; // const_cast
+ ::SetForegroundWindow(GetHwnd());
}
-wxWindow *wxDialog::FindSuitableParent() const
+// show dialog modally
+int wxDialog::ShowModal()
{
- // first try to use the currently active window
- HWND hwndFg = ::GetForegroundWindow();
- wxWindow *parent = hwndFg ? wxFindWinFromHandle((WXHWND)hwndFg)
- : NULL;
- if ( !parent )
- {
- // next try the main app window
- parent = wxTheApp->GetTopWindow();
- }
+ wxASSERT_MSG( !IsModal(), wxT("ShowModal() can't be called twice") );
- // finally, check if the parent we found is really suitable
- if ( !parent || parent == (wxWindow *)this || !parent->IsShown() )
+ Show();
+
+ // EndModal may have been called from InitDialog handler (called from
+ // inside Show()) and hidden the dialog back again
+ if ( IsShown() )
{
- // don't use this one
- parent = NULL;
+ // enter and run the modal loop
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
}
- return parent;
+ return GetReturnCode();
}
-void wxDialog::DoShowModal()
+void wxDialog::EndModal(int retCode)
{
- wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
- wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless dialog") );
-
- wxModalDialogs.Append(this);
+ wxASSERT_MSG( IsModal(), wxT("EndModal() called for non modal dialog") );
- 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);
- }
+ SetReturnCode(retCode);
- // disable all other app windows
- wxASSERT_MSG( !m_windowDisabler, _T("disabling windows twice?") );
+ Hide();
+}
- m_windowDisabler = new wxWindowDisabler(this);
+// ----------------------------------------------------------------------------
+// wxDialog gripper handling
+// ----------------------------------------------------------------------------
- // enter the modal loop
- while ( IsModalShowing() )
- {
-#if wxUSE_THREADS
- wxMutexGuiLeaveOrEnter();
-#endif // wxUSE_THREADS
+#if wxUSE_DIALOG_SIZEGRIP
- while ( !wxTheApp->Pending() && wxTheApp->ProcessIdle() )
- ;
+void wxDialog::SetWindowStyleFlag(long style)
+{
+ wxDialogBase::SetWindowStyleFlag(style);
- // a message came or no more idle processing to do
- wxTheApp->DoMessage();
- }
+ if ( HasFlag(wxRESIZE_BORDER) )
+ CreateGripper();
+ else
+ DestroyGripper();
+}
- // 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))
+void wxDialog::CreateGripper()
+{
+ 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();
- }
+ ResizeGripper();
- if ( IsModal() )
- {
- if ( show )
- {
- // modal dialog needs a parent window, so try to find one
- if ( !GetParent() )
- {
- m_parent = FindSuitableParent();
- }
-
- DoShowModal();
- }
- else // end of modal dialog
- {
- // this will cause IsModalShowing() return FALSE and our local
- // message loop will terminate
- wxModalDialogs.DeleteObject(this);
- }
- }
-
- 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))
+#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() )
- {
- EndModal(wxID_OK);
- }
-}
+ const int idOk = GetAffirmativeId();
+ if ( EmulateButtonClickIfPresent(idOk) )
+ return true;
-void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
-{
- if ( Validate() )
- TransferDataFromWindow();
+ wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
+ event.SetEventObject(this);
- // TODO probably need to disable the Apply button until things change again
+ return HandleWindowEvent(event);
}
+#endif // __POCKETPC__
-void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+// create main toolbar by calling OnCreateToolBar()
+wxToolBar* wxDialog::CreateToolBar(long style, wxWindowID winid, const wxString& name)
{
- EndModal(wxID_CANCEL);
-}
+ m_dialogToolBar = OnCreateToolBar(style, winid, name);
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
- // 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;
-
- 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;
}
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
+// return a new toolbar
+wxToolBar *wxDialog::OnCreateToolBar(long style,
+ wxWindowID winid,
+ const wxString& name)
{
-#if wxUSE_CTL3D
- Ctl3dColorChange();
-#else
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- Refresh();
-#endif
+ return new wxToolMenuBar(this, winid,
+ wxDefaultPosition, wxDefaultSize,
+ style, name);
}
+#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 )
{
+#ifdef __WXWINCE__
+ // react to pressing the OK button in the title
+ case WM_COMMAND:
+ {
+ switch ( LOWORD(wParam) )
+ {
+#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
case WM_CLOSE:
// if we can't close, tell the system that we processed the
// message - otherwise it would close us
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 resizeable
// at all and their standard class doesn't include CS_[VH]REDRAW
// styles which means that the window is not refreshed properly
// 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(wxNO_FULL_REPAINT_ON_RESIZE) )
+ processed = true;
+ if ( HasFlag(wxFULL_REPAINT_ON_RESIZE) )
{
- ::InvalidateRect(GetHwnd(), NULL, FALSE /* erase bg */);
+ ::InvalidateRect(GetHwnd(), NULL, false /* erase bg */);
}
break;
// 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;
// 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 // __WXMICROWIN__
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