Some changes in a vain attempt to make Salford C++ work; added FAQ files;

[wxWidgets.git] / include / wx / msw / dialog.h

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index b5026000399eaac41e01b166e8baa690317c96f7..b63c9875d07487690416ee3e95886dec444a6ada 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/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,35 +59,30 @@ public:
            long style = wxDEFAULT_DIALOG_STYLE,
            const wxString& name = wxDialogNameStr);
 
-  ~wxDialog(void);
+  ~wxDialog();
 
-  virtual bool Destroy(void);
-  void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
-    { wxWindow::SetSize(rect, sizeFlags); }
-  void SetSize(const wxSize& size) { wxWindow::SetSize(size); }
+  virtual bool Destroy();
 
-  void SetClientSize(int width, int height);
-  void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
+  virtual void SetClientSize(int width, int height);
 
-  void GetPosition(int *x, int *y) const;
-  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
+  virtual 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);
+  void OnSize(wxSizeEvent& event);
+  bool OnClose();
   void OnCharHook(wxKeyEvent& event);
   void OnPaint(wxPaintEvent& event);
   void OnCloseWindow(wxCloseEvent& event);
@@ -95,10 +90,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
@@ -114,7 +109,7 @@ 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);