new locales code checked in

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 917667ed4f75969d05daaad11ffa45d879819c94..ac570e9c29c21bebe1e49e836a9d0bd7eecc5871 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,62 +1,67 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dialog.h
 // Purpose:     wxDialog class
-// Author:      Julian Smart
+// Author:      David Webster
 // Modified by:
-// Created:     01/02/97
+// Created:     10/14/99
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
-#ifdef __GNUG__
-    #pragma interface "dialog.h"
-#endif
-
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLEXPORT wxDialog: public wxDialogBase
 {
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
+  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,
-             int x = -1, int y= -1, int width = 500, int height = 500,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
+
+  wxDialog();
+
+  // 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);
+        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)
+    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,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
+    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();
 
@@ -75,9 +80,9 @@ public:
 #endif
 
     virtual bool IsIconized() const;
-    void Fit();
+    void         Fit();
 
-    void SetTitle(const wxString& title);
+    void     SetTitle(const wxString& title);
     wxString GetTitle() const ;
 
     void OnSize(wxSizeEvent& event);
@@ -89,25 +94,23 @@ public:
     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 int  ShowModal();
     virtual void EndModal(int retCode);
 
     // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
+    void     OnOK(wxCommandEvent& event);
+    void     OnApply(wxCommandEvent& event);
+    void     OnCancel(wxCommandEvent& event);
 
     // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
+    void     OnSysColourChanged(wxSysColourChangedEvent& event);
 
     // implementation
     // --------------
-
-    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+    virtual MRESULT OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
@@ -130,7 +133,8 @@ private:
 #endif // tooltips
 
 private:
-    DECLARE_EVENT_TABLE()
+
+DECLARE_EVENT_TABLE()
 };
 
 #endif