// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart and Markus Holzem
-// Licence: wxWindows license
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DIALOG_H_
#define _WX_DIALOG_H_
-#ifdef __GNUG__
- #pragma interface "dialog.h"
-#endif
-
#include "wx/panel.h"
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
+
+class WXDLLEXPORT wxDialogModalData;
+
+#if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
+class WXDLLEXPORT wxToolBar;
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
+#endif
// Dialog boxes
class WXDLLEXPORT wxDialog : public wxDialogBase
public:
wxDialog() { Init(); }
- // Constructor with a modal flag, but no window id - the old convention
- wxDialog(wxWindow *parent,
- const wxString& title, bool modal,
- int x = -1, int y= -1, int width = 500, int height = 500,
- long style = wxDEFAULT_DIALOG_STYLE,
- const wxString& name = wxDialogNameStr)
- {
- long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
- Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
- style | modalStyle, name);
- }
-
- // Constructor with no modal flag - the new convention.
+ // full ctor
wxDialog(wxWindow *parent, wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxDialogNameStr)
{
- Create(parent, id, title, pos, size, style, name);
+ Init();
+
+ (void)Create(parent, id, title, pos, size, style, name);
}
bool Create(wxWindow *parent, wxWindowID id,
virtual ~wxDialog();
- void SetModal(bool flag);
- virtual bool IsModal() const;
+ // return true if we're showing the dialog modally
+ virtual bool IsModal() const { return m_modalData != NULL; }
- // For now, same as Show(TRUE) but returns return code
+ // show the dialog modally and return the value passed to EndModal()
virtual int ShowModal();
// may be called to terminate the dialog with the given return code
virtual void EndModal(int retCode);
- // returns TRUE if we're in a modal loop
- bool IsModalShowing() const;
- // wxMSW only: remove the "Close" button from the dialog
- bool EnableCloseButton(bool enable = TRUE);
+ // we treat dialog toolbars specially under Windows CE
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ // create main toolbar by calling OnCreateToolBar()
+ virtual wxToolBar* CreateToolBar(long style = -1,
+ wxWindowID winid = wxID_ANY,
+ const wxString& name = wxToolBarNameStr);
+ // return a new toolbar
+ virtual wxToolBar *OnCreateToolBar(long style,
+ wxWindowID winid,
+ const wxString& name );
+
+ // get the main toolbar
+ wxToolBar *GetToolBar() const { return m_dialogToolBar; }
+#endif // wxUSE_TOOLBAR && __POCKETPC__
+
// implementation only from now on
// -------------------------------
// override some base class virtuals
- virtual bool Show(bool show);
+ virtual bool Show(bool show = true);
- // event handlers
- bool OnClose();
- void OnCharHook(wxKeyEvent& event);
- void OnCloseWindow(wxCloseEvent& event);
+ virtual void Raise();
- // Standard buttons
- void OnOK(wxCommandEvent& event);
- void OnApply(wxCommandEvent& event);
- void OnCancel(wxCommandEvent& event);
-
- // Responds to colour changes
- void OnSysColourChanged(wxSysColourChangedEvent& 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 with SetAffirmativeId. Returns false
+ // if the event was not processed.
+ virtual bool DoOK();
+#endif
// Windows callbacks
- long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+ WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-#if wxUSE_CTL3D
- virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
- WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-#endif // wxUSE_CTL3D
+#if WXWIN_COMPATIBILITY_2_6
+ // use the other ctor
+ wxDEPRECATED( wxDialog(wxWindow *parent,
+ const wxString& title, bool modal,
+ int x = wxDefaultCoord, int y = wxDefaultCoord, int width = 500, int height = 500,
+ long style = wxDEFAULT_DIALOG_STYLE,
+ const wxString& name = wxDialogNameStr) );
+
+ // just call Show() or ShowModal()
+ wxDEPRECATED( void SetModal(bool flag) );
+
+ // use IsModal()
+ wxDEPRECATED( bool IsModalShowing() const );
+#endif // WXWIN_COMPATIBILITY_2_6
protected:
- // show modal dialog and enter modal loop
- void DoShowModal();
+ // find the window to use as parent for this dialog if none has been
+ // specified explicitly by the user
+ //
+ // may return NULL
+ wxWindow *FindSuitableParent() const;
// common part of all ctors
void Init();
private:
- wxWindow *m_oldFocus;
+ wxWindow* m_oldFocus;
+ bool m_endModalCalled; // allow for closing within InitDialog
+
+#if wxUSE_TOOLBAR && defined(__POCKETPC__)
+ wxToolBar* m_dialogToolBar;
+#endif
- // while we are showing a modal dialog we disable the other windows using
- // this object
- class wxWindowDisabler *m_windowDisabler;
+ // this pointer is non-NULL only while the modal event loop is running
+ wxDialogModalData *m_modalData;
DECLARE_DYNAMIC_CLASS(wxDialog)
- DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxDialog)
};
#endif
projects / wxWidgets.git / blobdiff