removal before binary insertion

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index f3e9616d929ed9f8096eb0de46324d0e1227b387..b63c9875d07487690416ee3e95886dec444a6ada 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DIALOGH__
-#define __DIALOGH__
+#ifndef _WX_DIALOG_H_
+#define _WX_DIALOG_H_

 
 #ifdef __GNUG__
 #pragma interface "dialog.h"
 
 #ifdef __GNUG__
 #pragma interface "dialog.h"


@@ -28,13 +28,13 @@ class WXDLLEXPORT wxDialog: public wxPanel
   bool m_modalShowing;
 public:
 
   bool m_modalShowing;
 public:
 

-  wxDialog(void);
+  wxDialog();

 
   // Constructor with a modal flag, but no window id - the old convention
   inline wxDialog(wxWindow *parent,
            const wxString& title, bool modal,
 
   // Constructor with a modal flag, but no window id - the old convention
   inline wxDialog(wxWindow *parent,
            const wxString& title, bool modal,

-           const int x = -1, const int y= -1, const int width = 500, const int height = 500,
-           const long style = wxDEFAULT_DIALOG_STYLE,
+           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 ;
            const wxString& name = wxDialogNameStr)
   {
       long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;


@@ -42,55 +42,58 @@ public:
   }
 
   // Constructor with no modal flag - the new convention.
   }
 
   // Constructor with no modal flag - the new convention.

-  inline wxDialog(wxWindow *parent, const wxWindowID id,
+  inline wxDialog(wxWindow *parent, wxWindowID id,

            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& title,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxDEFAULT_DIALOG_STYLE,
+           long style = wxDEFAULT_DIALOG_STYLE,

            const wxString& name = wxDialogNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
   }
 
            const wxString& name = wxDialogNameStr)
   {
       Create(parent, id, title, pos, size, style, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxString& title, // bool modal = FALSE, // TODO make this a window style?
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& title, // bool modal = FALSE, // TODO make this a window style?
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const long style = wxDEFAULT_DIALOG_STYLE,
+           long style = wxDEFAULT_DIALOG_STYLE,

            const wxString& name = wxDialogNameStr);
 
            const wxString& name = wxDialogNameStr);
 

-  ~wxDialog(void);
+  ~wxDialog();

 
 

-  virtual bool Destroy(void);
-  void SetSize(const int x, const int y, const int width, const int height, const int sizeFlags = wxSIZE_AUTO);
-  void SetClientSize(const int width, const int height);
-  void GetPosition(int *x, int *y) const;
-  bool Show(const bool show);
-  bool IsShown(void) const ;
-  void Iconize(const bool iconize);
+  virtual bool Destroy();
+
+  virtual void SetClientSize(int width, int height);
+
+  virtual void GetPosition(int *x, int *y) const;
+
+  bool Show(bool show);
+  bool IsShown() const ;
+  void Iconize(bool iconize);

 
 #if WXWIN_COMPATIBILITY
 
 #if WXWIN_COMPATIBILITY

-  inline bool Iconized(void) const { return IsIconized(); };
+  inline bool Iconized() const { return IsIconized(); };

 #endif
 
 #endif
 

-  virtual bool IsIconized(void) const;
-  void Fit(void);
+  virtual bool IsIconized() const;
+  void Fit();

 
   void SetTitle(const wxString& title);
 
   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);
 
   void OnCharHook(wxKeyEvent& event);
   void OnPaint(wxPaintEvent& event);
   void OnCloseWindow(wxCloseEvent& event);
 

-  void SetModal(const bool flag);
+  void SetModal(bool flag);

 
 

-  virtual void Centre(const int direction = wxBOTH);
-  virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+  virtual void Centre(int direction = wxBOTH);
+  virtual bool IsModal() const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }

 
   // For now, same as Show(TRUE) but returns return code
 
   // For now, same as Show(TRUE) but returns return code

-  virtual int ShowModal(void);
+  virtual int ShowModal();

   virtual void EndModal(int retCode);
 
   // Standard buttons
   virtual void EndModal(int retCode);
 
   // Standard buttons


@@ -106,13 +109,16 @@ public:
   virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
   virtual bool MSWProcessMessage(WXMSG* pMsg);
 //  virtual bool MSWOnEraseBkgnd(WXHDC pDC);
   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 ; }
   inline bool IsModalShowing() const { return m_modalShowing ; }

-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,

                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

+protected:
+  WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
+

 DECLARE_EVENT_TABLE()
 };
 
 #endif
 DECLARE_EVENT_TABLE()
 };
 
 #endif

-    // __DIALOGH__
+    // _WX_DIALOG_H_