#include <commdlg.h>
#endif
+#ifdef __SMARTPHONE__
+ #include "wx/msw/wince/resources.h"
+#endif // __SMARTPHONE__
+
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
wxFLAGS_MEMBER(wxBORDER_RAISED)
wxFLAGS_MEMBER(wxBORDER_STATIC)
wxFLAGS_MEMBER(wxBORDER_NONE)
-
+
// old style border flags
wxFLAGS_MEMBER(wxSIMPLE_BORDER)
wxFLAGS_MEMBER(wxSUNKEN_BORDER)
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 , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+ 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)
+wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size , long , WindowStyle)
#else
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
void wxDialog::Init()
{
m_oldFocus = (wxWindow *)NULL;
- m_isShown = FALSE;
+ m_isShown = false;
m_modalData = NULL;
- m_endModalCalled = FALSE;
+ m_endModalCalled = false;
}
bool wxDialog::Create(wxWindow *parent,
style |= wxTAB_TRAVERSAL;
if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
- return FALSE;
+ return false;
if ( !m_hasFont )
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- return TRUE;
+#ifdef __SMARTPHONE__
+ SetLeftMenu(wxID_OK, _("OK"));
+#endif
+
+ return true;
}
-void wxDialog::SetModal(bool flag)
+// 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)
{
- if ( flag )
- {
- wxModelessWindows.DeleteObject(this);
- }
- else
- {
- wxModelessWindows.Append(this);
- }
+ Init();
+
+ Create(parent, -1, title, wxPoint(x, y), wxSize(w, h), style, name);
+}
+
+void wxDialog::SetModal(bool WXUNUSED(flag))
+{
+ // nothing to do, obsolete method
}
wxDialog::~wxDialog()
{
- m_isBeingDeleted = TRUE;
+ m_isBeingDeleted = true;
// this will also reenable all the other windows for a modal dialog
- Show(FALSE);
+ Show(false);
}
// ----------------------------------------------------------------------------
// showing the dialogs
// ----------------------------------------------------------------------------
-bool wxDialog::IsModal() const
-{
- return !wxModelessWindows.Find(this);
-}
-
bool wxDialog::IsModalShowing() const
{
- return m_modalData != NULL;
+ return IsModal();
}
wxWindow *wxDialog::FindSuitableParent() const
return parent;
}
-void wxDialog::DoShowModal()
-{
- wxCHECK_RET( !IsModalShowing(), _T("DoShowModal() called twice") );
- wxCHECK_RET( IsModal(), _T("can't DoShowModal() modeless 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);
- }
-
- // enter the modal loop
- {
- wxDialogModalDataTiedPtr modalData(&m_modalData,
- new wxDialogModalData(this));
- modalData->RunLoop();
- }
-
- // 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))
- {
- // This is likely to prove that the object still exists
- if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
- oldFocus->SetFocus();
- }
-}
-
bool wxDialog::Show(bool show)
{
+ if ( show == IsShown() )
+ return false;
+
if ( !show && m_modalData )
{
// we need to do this before calling wxDialogBase version because if we
m_modalData->ExitLoop();
}
- // ShowModal() may be called for already shown dialog
- if ( !wxDialogBase::Show(show) && !(show && IsModal()) )
+ if ( show )
{
- // nothing to do
- return FALSE;
+ // 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();
}
+ wxDialogBase::Show(show);
+
if ( show )
{
// dialogs don't get WM_SIZE message after creation unlike most (all?)
// NB: normally we should call it just the first time but doing it
// every time is simpler than keeping a flag
Layout();
-
- // this usually will result in TransferDataToWindow() being called
- InitDialog();
}
- // EndModal may have been called from InitDialog handler,
- // which would cause an infinite loop if we didn't take it
- // into account
- if ( show && IsModal() && !m_endModalCalled )
- {
- // modal dialog needs a parent window, so try to find one
- if ( !GetParent() )
- {
- m_parent = FindSuitableParent();
- }
-
- DoShowModal();
- }
-
- return TRUE;
+ return true;
}
void wxDialog::Raise()
::SetForegroundWindow(GetHwnd());
}
-// a special version for Show(TRUE) for modal dialogs which returns return code
+// show dialog modally
int wxDialog::ShowModal()
{
- m_endModalCalled = FALSE;
- if ( !IsModal() )
+ wxASSERT_MSG( !IsModal(), _T("wxDialog::ShowModal() reentered?") );
+
+ m_endModalCalled = false;
+
+ Show();
+
+ // EndModal may have been called from InitDialog handler (called from
+ // inside Show()), which would cause an infinite loop if we didn't take it
+ // into account
+ if ( !m_endModalCalled )
{
- SetModal(TRUE);
- }
+ // modal dialog needs a parent window, so try to find one
+ wxWindow *parent = GetParent();
+ if ( !parent )
+ {
+ parent = FindSuitableParent();
+ }
+
+ // remember where the focus was
+ wxWindow *oldFocus = m_oldFocus;
+ if ( !oldFocus )
+ {
+ // VZ: do we really want to do this?
+ oldFocus = parent;
+ }
+
+ // 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 = oldFocus ? GetHwndOf(oldFocus) : NULL;
- Show(TRUE);
+
+ // enter and run the modal loop
+ {
+ wxDialogModalDataTiedPtr modalData(&m_modalData,
+ new wxDialogModalData(this));
+ modalData->RunLoop();
+ }
+
+
+ // 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))
+ {
+ // This is likely to prove that the object still exists
+ if (wxFindWinFromHandle((WXHWND) hwndOldFocus) == oldFocus)
+ oldFocus->SetFocus();
+ }
+ }
return GetReturnCode();
}
-// 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)
{
- m_endModalCalled = TRUE;
+ wxASSERT_MSG( IsModal(), _T("EndModal() called for non modal dialog") );
+
+ m_endModalCalled = true;
SetReturnCode(retCode);
- Show(FALSE);
+ Hide();
+}
+
+void wxDialog::EndDialog(int rc)
+{
+ if ( IsModal() )
+ EndModal(rc);
+ else
+ Hide();
}
// ----------------------------------------------------------------------------
{
if ( Validate() && TransferDataFromWindow() )
{
- EndModal(wxID_OK);
+ EndDialog(wxID_OK);
}
}
void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
{
- EndModal(wxID_CANCEL);
+ EndDialog(wxID_CANCEL);
}
void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
WXLRESULT rc = 0;
- bool processed = FALSE;
+ bool processed = false;
switch ( message )
{
+#ifdef __WXWINCE__
+ // react to pressing the OK button in the title
+ case WM_COMMAND:
+ {
+ switch ( LOWORD(wParam) )
+ {
+#ifndef __SMARTPHONE__
+ case IDOK:
+ wxButton *btn = wxDynamicCast(FindWindow(wxID_CANCEL), wxButton);
+ if ( btn && btn->IsEnabled() )
+ {
+ // if we do have a cancel button, do press it
+ btn->MSWCommand(BN_CLICKED, 0 /* unused */);
+ processed = true;
+ break;
+ }
+#else // 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
// 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;
+ 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__
projects / wxWidgets.git / blobdiff