X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a141e01844d244c8d7c215d4a31530e23298fc73..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/dialog.h

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 1381744a35..02afe5be8a 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -12,23 +12,19 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dialog.h"
-#endif
-
 #include "wx/panel.h"
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 
-class WXDLLEXPORT wxDialogModalData;
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
-class WXDLLEXPORT wxToolBar;
-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxToolBarNameStr[];
 #endif
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
 {
 public:
     wxDialog() { Init(); }
@@ -89,17 +85,7 @@ public:
 
     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);
+    virtual void SetWindowStyleFlag(long style);
 
 #ifdef __POCKETPC__
     // Responds to the OK button in a PocketPC titlebar. This
@@ -112,22 +98,6 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
-    // obsolete methods
-    // ----------------
-
-    // 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 );
-
 protected:
     // find the window to use as parent for this dialog if none has been
     // specified explicitly by the user
@@ -138,20 +108,17 @@ protected:
     // common part of all ctors
     void Init();
 
-    // end either modal or modeless dialog
-    void EndDialog(int rc);
-
-    // emulate click of a button with the given id if it's present in the dialog
-    //
-    // return true if button was "clicked" or false if we don't have it
-    bool EmulateButtonClickIfPresent(int id);
-
-    // handle Escape here
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
+    // these functions deal with the gripper window shown in the corner of
+    // resizeable dialogs
+    void CreateGripper();
+    void DestroyGripper();
+    void ShowGripper(bool show);
+    void ResizeGripper();
 
 private:
-    wxWindow*   m_oldFocus;
-    bool        m_endModalCalled; // allow for closing within InitDialog
+    // this function is used to adjust Z-order of new children relative to the
+    // gripper if we have one
+    void OnWindowCreate(wxWindowCreateEvent& event);
 
 #if wxUSE_TOOLBAR && defined(__POCKETPC__)
     wxToolBar*  m_dialogToolBar;
@@ -160,9 +127,11 @@ private:
     // this pointer is non-NULL only while the modal event loop is running
     wxDialogModalData *m_modalData;
 
+    // gripper window for a resizable dialog, NULL if we're not resizable
+    WXHWND m_hGripper;
+
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 };
 
 #endif