X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..c9ccc09c64f4c29d4667796bef7b507d9e8d25ed:/include/wx/palmos/dialog.h?ds=sidebyside diff --git a/include/wx/palmos/dialog.h b/include/wx/palmos/dialog.h index 631096f61b..717c30132d 100644 --- a/include/wx/palmos/dialog.h +++ b/include/wx/palmos/dialog.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/palmos/dialog.h // Purpose: wxDialog class -// Author: William Osborne +// Author: William Osborne - minimal working wxPalmOS port // Modified by: // Created: 10/13/04 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) William Osborne // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,18 +12,14 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dialog.h" -#endif - #include "wx/panel.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr; +//WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxDialogNameStr[]; -class WXDLLEXPORT wxDialogModalData; +class WXDLLIMPEXP_FWD_CORE wxDialogModalData; // Dialog boxes -class WXDLLEXPORT wxDialog : public wxDialogBase +class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase { public: wxDialog() { Init(); } @@ -63,53 +59,11 @@ public: // ------------------------------- // override some base class virtuals - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); virtual void Raise(); - // event handlers - void OnCharHook(wxKeyEvent& event); - void OnCloseWindow(wxCloseEvent& event); - - // Standard buttons - void OnOK(wxCommandEvent& event); - void OnApply(wxCommandEvent& event); - void OnCancel(wxCommandEvent& event); - - // Responds to colour changes - void OnSysColourChanged(wxSysColourChangedEvent& event); - - // Windows callbacks - 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 - - // obsolete methods - // ---------------- - - // use the other ctor - wxDEPRECATED( 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) ); - - // just call Show() or ShowModal() - wxDEPRECATED( void SetModal(bool flag) ); - - // use IsModal() - wxDEPRECATED( bool IsModalShowing() const ); - protected: - // 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(); @@ -122,8 +76,7 @@ private: DECLARE_DYNAMIC_CLASS(wxDialog) - DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxDialog) + wxDECLARE_NO_COPY_CLASS(wxDialog); }; #endif