Added missing | symbol

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index b5026000399eaac41e01b166e8baa690317c96f7..e5bd76e8cb73d33125a88833860d8c609dfbccea 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -6,14 +6,14 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #ifdef __GNUG__

-#pragma interface "dialog.h"
+    #pragma interface "dialog.h"

 #endif
 
 #include "wx/panel.h"
 #endif
 
 #include "wx/panel.h"


@@ -21,108 +21,112 @@
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 // Dialog boxes
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 // Dialog boxes

-class WXDLLEXPORT wxDialog: public wxPanel
+class WXDLLEXPORT wxDialog : public wxPanel

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxDialog)
- protected:
-  bool m_modalShowing;
-public:
+    DECLARE_DYNAMIC_CLASS(wxDialog)

 
 

-  wxDialog(void);
-
-  // Constructor with a modal flag, but no window id - the old convention
-  inline 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)
-  {
-      long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
-      Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style|modalStyle, name);
-  }
-
-  // Constructor with no modal flag - the new convention.
-  inline wxDialog(wxWindow *parent, wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_DIALOG_STYLE,
-           const wxString& name = wxDialogNameStr)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
-
-  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,
-           long style = wxDEFAULT_DIALOG_STYLE,
-           const wxString& name = wxDialogNameStr);
-
-  ~wxDialog(void);
-
-  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); }
-
-  void SetClientSize(int width, int height);
-  void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); }
-
-  void GetPosition(int *x, int *y) const;
-  wxPoint GetPosition() const { return wxWindow::GetPosition(); }
-
-  bool Show(bool show);
-  bool IsShown(void) const ;
-  void Iconize(bool iconize);
+public:
+    wxDialog();
+
+    // Constructor with a modal flag, but no window id - the old convention
+    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)
+    {
+        long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ;
+        Create(parent, -1, title, wxPoint(x, y), wxSize(width, height),
+               style | modalStyle, name);
+    }
+
+    // Constructor with no modal flag - the new convention.
+    wxDialog(wxWindow *parent, wxWindowID id,
+             const wxString& title,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = wxDEFAULT_DIALOG_STYLE,
+             const wxString& name = wxDialogNameStr)
+    {
+        Create(parent, id, title, pos, size, style, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+                const wxString& title,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxDEFAULT_DIALOG_STYLE,
+                const wxString& name = wxDialogNameStr);
+
+    ~wxDialog();
+
+    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(); };
+    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);
+    wxString GetTitle() const ;

 
 

-  void SetTitle(const wxString& title);
-  wxString GetTitle(void) const ;
+    void OnSize(wxSizeEvent& event);
+    bool OnClose();
+    void OnCharHook(wxKeyEvent& event);
+    void OnPaint(wxPaintEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);

 
 

-  bool OnClose(void);
-  void OnCharHook(wxKeyEvent& event);
-  void OnPaint(wxPaintEvent& event);
-  void OnCloseWindow(wxCloseEvent& event);
+    void SetModal(bool flag);

 
 

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

 
 

-  virtual void Centre(int direction = wxBOTH);
-  virtual bool IsModal(void) const { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    // For now, same as Show(TRUE) but returns return code
+    virtual int ShowModal();
+    virtual void EndModal(int retCode);

 
 

-  // For now, same as Show(TRUE) but returns return code
-  virtual int ShowModal(void);
-  virtual void EndModal(int retCode);
+    // Standard buttons
+    void OnOK(wxCommandEvent& event);
+    void OnApply(wxCommandEvent& event);
+    void OnCancel(wxCommandEvent& event);

 
 

-  // Standard buttons
-  void OnOK(wxCommandEvent& event);
-  void OnApply(wxCommandEvent& event);
-  void OnCancel(wxCommandEvent& event);
+    // Responds to colour changes
+    void OnSysColourChanged(wxSysColourChangedEvent& event);

 
 

-  // Responds to colour changes
-  void OnSysColourChanged(wxSysColourChangedEvent& event);
+    // IMPLEMENTATION
+    virtual bool MSWProcessMessage(WXMSG* pMsg);
+    virtual bool MSWOnClose();
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 
 

-  // IMPLEMENTATION
-  virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-  virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-  virtual bool MSWProcessMessage(WXMSG* pMsg);
-//  virtual bool MSWOnEraseBkgnd(WXHDC pDC);
-  virtual bool MSWOnClose(void);
-  inline bool IsModalShowing() const { return m_modalShowing ; }
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    bool IsModalShowing() const { return m_modalShowing; }
+
+  // tooltip management
+#if wxUSE_TOOLTIPS
+    WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
+    void SetToolTipCtrl(WXHWND hwndTT) { m_hwndToolTip = hwndTT; }
+#endif // tooltips

 
 protected:
 
 protected:

-  WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
+    bool   m_modalShowing;
+    WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
+
+#if wxUSE_TOOLTIPS
+    WXHWND                m_hwndToolTip;
+#endif // tooltips

 
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif