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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index d44d0081af..8ec1b50995 100644
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DIALOGH__
-#define __DIALOGH__
+#ifndef _WX_DIALOG_H_
+#define _WX_DIALOG_H_
 
 #ifdef __GNUG__
 #pragma interface "dialog.h"
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxDialog: public wxPanel
   bool m_modalShowing;
 public:
 
-  wxDialog(void);
+  wxDialog();
 
   // Constructor with a modal flag, but no window id - the old convention
   inline wxDialog(wxWindow *parent,
@@ -59,27 +59,29 @@ public:
            long style = wxDEFAULT_DIALOG_STYLE,
            const wxString& name = wxDialogNameStr);
 
-  ~wxDialog(void);
+  ~wxDialog();
+
+  virtual bool Destroy();
+
+  virtual void SetClientSize(int width, int height);
+
+  virtual void GetPosition(int *x, int *y) const;
 
-  virtual bool Destroy(void);
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetClientSize(int width, int height);
-  void GetPosition(int *x, int *y) const;
   bool Show(bool show);
-  bool IsShown(void) const ;
+  bool IsShown() const ;
   void Iconize(bool iconize);
 
 #if WXWIN_COMPATIBILITY
-  inline bool Iconized(void) const { return IsIconized(); };
+  inline bool Iconized() const { return IsIconized(); };
 #endif
 
-  virtual bool IsIconized(void) const;
-  void Fit(void);
+  virtual bool IsIconized() const;
+  void Fit();
 
   void SetTitle(const wxString& title);
-  wxString GetTitle(void) const ;
+  wxString GetTitle() const ;
 
-  bool OnClose(void);
+  bool OnClose();
   void OnCharHook(wxKeyEvent& event);
   void OnPaint(wxPaintEvent& event);
   void OnCloseWindow(wxCloseEvent& event);
@@ -87,10 +89,10 @@ public:
   void SetModal(bool flag);
 
   virtual void Centre(int direction = wxBOTH);
-  virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+  virtual bool IsModal() const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
 
   // For now, same as Show(TRUE) but returns return code
-  virtual int ShowModal(void);
+  virtual int ShowModal();
   virtual void EndModal(int retCode);
 
   // Standard buttons
@@ -106,13 +108,16 @@ public:
   virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
   virtual bool MSWProcessMessage(WXMSG* pMsg);
 //  virtual bool MSWOnEraseBkgnd(WXHDC pDC);
-  virtual bool MSWOnClose(void);
+  virtual bool MSWOnClose();
   inline bool IsModalShowing() const { return m_modalShowing ; }
   virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
   			WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
+protected:
+  WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
+
 DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // __DIALOGH__
+    // _WX_DIALOG_H_