#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/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/ptr_scpd.h"
-#include "wx/msw/wrapcdlg.h"
-
#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
#include "wx/msw/wince/resources.h"
#endif // __SMARTPHONE__ && __WXWINCE__
-#if wxUSE_TOOLBAR && defined(__POCKETPC__)
-#include "wx/toolbar.h"
-#endif
-
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
#endif
-BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
- EVT_BUTTON(wxID_OK, wxDialog::OnOK)
- 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()
-
// ----------------------------------------------------------------------------
// wxDialogModalData
// ----------------------------------------------------------------------------
#if wxUSE_TOOLBAR && defined(__POCKETPC__)
m_dialogToolBar = NULL;
#endif
+ m_hGripper = 0;
}
bool wxDialog::Create(wxWindow *parent,
CreateToolBar();
#endif
- return true;
-}
-
-#if WXWIN_COMPATIBILITY_2_6
-
-// 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)
-{
- Init();
-
- Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(w, h), style, name);
-}
+ if ( HasFlag(wxRESIZE_BORDER) )
+ CreateGripper();
-void wxDialog::SetModal(bool WXUNUSED(flag))
-{
- // nothing to do, obsolete method
+ return true;
}
-#endif // WXWIN_COMPATIBILITY_2_6
-
wxDialog::~wxDialog()
{
m_isBeingDeleted = true;
// this will also reenable all the other windows for a modal dialog
Show(false);
+
+ DestroyGripper();
}
// ----------------------------------------------------------------------------
// showing the dialogs
// ----------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY_2_6
-
-bool wxDialog::IsModalShowing() const
-{
- return IsModal();
-}
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
wxWindow *wxDialog::FindSuitableParent() const
{
// first try to use the currently active window
if ( show )
{
+ if (CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
// 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
if ( show )
{
- // dialogs don't get WM_SIZE message after creation unlike most (all?)
- // other windows and so could start their life non laid out correctly
- // if we didn't call Layout() from here
+ // 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
- Layout();
+ const wxSize size = GetClientSize();
+ ::SendMessage(GetHwnd(), WM_SIZE,
+ SIZE_RESTORED, MAKELPARAM(size.x, size.y));
}
return true;
Hide();
}
-void wxDialog::EndDialog(int rc)
-{
- if ( IsModal() )
- EndModal(rc);
- else
- Hide();
-}
-
// ----------------------------------------------------------------------------
-// wxWin event handlers
+// wxDialog gripper handling
// ----------------------------------------------------------------------------
-bool wxDialog::EmulateButtonClickIfPresent(int id)
+void wxDialog::SetWindowStyleFlag(long style)
{
- wxButton *btn = wxDynamicCast(FindWindow(id), wxButton);
-
- if ( !btn || !btn->IsEnabled() || !btn->IsShown() )
- return false;
-
- btn->MSWCommand(BN_CLICKED, 0 /* unused */);
- return true;
-}
+ wxDialogBase::SetWindowStyleFlag(style);
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
- if ( Validate() && TransferDataFromWindow() )
- {
- EndDialog(wxID_OK);
- }
+ if ( HasFlag(wxRESIZE_BORDER) )
+ CreateGripper();
+ else
+ DestroyGripper();
}
-void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
+void wxDialog::CreateGripper()
{
- if ( Validate() )
- TransferDataFromWindow();
-
- // TODO probably need to disable the Apply button until things change again
+ if ( !m_hGripper )
+ {
+ // 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
+ );
+ }
}
-void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
+void wxDialog::DestroyGripper()
{
- EndDialog(wxID_CANCEL);
+ if ( m_hGripper )
+ {
+ ::DestroyWindow((HWND) m_hGripper);
+ m_hGripper = 0;
+ }
}
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+void wxDialog::ShowGripper(bool show)
{
- // We'll send a Cancel message by default, which may close the dialog.
- // Check for looping if the Cancel event handler calls Close().
+ wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
- // 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.
+ if ( show )
+ ResizeGripper();
- // 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;
+ ::ShowWindow((HWND)m_hGripper, show ? SW_SHOW : SW_HIDE);
+}
- if ( closing.Member(this) )
- return;
+void wxDialog::ResizeGripper()
+{
+ wxASSERT_MSG( m_hGripper, _T("shouldn't be called if we have no gripper") );
- closing.Append(this);
+ HWND hwndGripper = (HWND)m_hGripper;
- wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- cancelEvent.SetEventObject( this );
- GetEventHandler()->ProcessEvent(cancelEvent); // This may close the dialog
+ const wxRect rectGripper = wxRectFromRECT(wxGetWindowRect(hwndGripper));
+ const wxSize size = GetClientSize() - rectGripper.GetSize();
- closing.DeleteObject(this);
+ ::SetWindowPos(hwndGripper, HWND_BOTTOM,
+ size.x, size.y,
+ rectGripper.width, rectGripper.height,
+ SWP_NOACTIVATE);
}
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
-{
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
- Refresh();
-}
+// ----------------------------------------------------------------------------
+// wxWin event handlers
+// ----------------------------------------------------------------------------
#ifdef __POCKETPC__
// Responds to the OK button in a PocketPC titlebar. This
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, GetAffirmativeId());
event.SetEventObject(this);
- return GetEventHandler()->ProcessEvent(event);
+ return HandleWindowEvent(event);
}
#endif // __POCKETPC__
// dialog Windows messages processing
// ---------------------------------------------------------------------------
-bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
-{
- const MSG * const msg = wx_reinterpret_cast(MSG *, pMsg);
- if ( msg->message == WM_KEYDOWN && msg->wParam == VK_ESCAPE )
- {
- int idCancel = GetEscapeId();
- switch ( idCancel )
- {
- case wxID_NONE:
- // don't handle Esc specially at all
- break;
-
- case wxID_ANY:
- // this value is special: it means translate Esc to wxID_CANCEL
- // but if there is no such button, then fall back to wxID_OK
- if ( EmulateButtonClickIfPresent(wxID_CANCEL) )
- return true;
- idCancel = wxID_OK;
- // fall through
-
- default:
- // translate Esc to button press for the button with given id
- if ( EmulateButtonClickIfPresent(idCancel) )
- return true;
- }
- }
-
- return wxDialogBase::MSWProcessMessage(pMsg);
-}
-
WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
WXLRESULT rc = 0;
break;
case WM_SIZE:
+ if ( m_hGripper )
+ {
+ switch ( wParam )
+ {
+ case SIZE_MAXIMIZED:
+ ShowGripper(false);
+ break;
+
+ case SIZE_RESTORED:
+ ShowGripper(true);
+ }
+ }
+
// 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
projects / wxWidgets.git / blobdiff