A few small fixes for cross compilation

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index f55129ccf9df6c929987938f3b66b03d3e9216ef..0e4dce9d62304171aeedeee202425169db95d5aa 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -6,7 +6,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
@@ -18,16 +18,16 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxPanel
+class WXDLLEXPORT wxDialog : public wxDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
 public:
     wxDialog();
-    
+
     // Constructor with a modal flag, but no window id - the old convention
     wxDialog(wxWindow *parent,
              const wxString& title, bool modal,
@@ -39,7 +39,7 @@ public:
         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,
@@ -50,72 +50,85 @@ public:
     {
         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 DoSetClientSize(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
     bool Iconized() const { return IsIconized(); };
 #endif
-    
+
     virtual bool IsIconized() const;
     void Fit();
-    
+
     void SetTitle(const wxString& title);
     wxString GetTitle() const ;
-    
+
     void OnSize(wxSizeEvent& event);
     bool OnClose();
     void OnCharHook(wxKeyEvent& event);
     void OnPaint(wxPaintEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-    
+
     void SetModal(bool flag);
-    
+
     virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const
-        { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
-    
+    virtual bool IsModal() const;
+
     // For now, same as Show(TRUE) but returns return code
     virtual int ShowModal();
     virtual void EndModal(int retCode);
-    
+
     // Standard buttons
     void OnOK(wxCommandEvent& event);
     void OnApply(wxCommandEvent& event);
     void OnCancel(wxCommandEvent& event);
-    
+
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
-    
-    // IMPLEMENTATION
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-    virtual bool MSWOnClose();
+
+    // implementation
+    // --------------
+
+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
     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:
     bool   m_modalShowing;
     WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
-    
+
+private:
+#if wxUSE_TOOLTIPS
+    WXHWND                m_hwndToolTip;
+#endif // tooltips
+
+private:
     DECLARE_EVENT_TABLE()
 };