Fix wxPropertyGrid::GetPropertyRect when the last item is collapsed.

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 5a5a49a3212e721e42b2af5d501dcd146146b630..e4136df3c98f99b122292e8f49283a930c1461f3 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dialog.h
+// Name:        wx/os2/dialog.h
 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:
 // Created:     10/14/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,14 +13,14 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
 
-class WXDLLEXPORT wxDialogModalData;
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
 
 //
 // Dialog boxes
 //
-class WXDLLEXPORT wxDialog: public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase
 {
 public:
 
@@ -65,24 +64,6 @@ public:
     // override some base class virtuals
     virtual bool Show(bool show = true);
 
-    //
-    // Event handlers
-    //
-    void OnCharHook(wxKeyEvent& rEvent);
-    void OnCloseWindow(wxCloseEvent& rEvent);
-
-    //
-    // Standard buttons
-    //
-    void     OnOK(wxCommandEvent& rEvent);
-    void     OnApply(wxCommandEvent& rEvent);
-    void     OnCancel(wxCommandEvent& rEvent);
-
-    //
-    // Responds to colour changes
-    //
-    void     OnSysColourChanged(wxSysColourChangedEvent& rEvent);
-
     //
     // Callbacks
     //
@@ -90,8 +71,7 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
-    // obsolete methods
-    // ----------------
+#if WXWIN_COMPATIBILITY_2_6
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDEPRECATED( wxDialog( wxWindow*       pParent
@@ -111,23 +91,14 @@ public:
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 
-protected:
-    //
-    // find the window to use as parent for this dialog if none has been
-    // specified explicitly by the user
-    //
-    // may return NULL
-    //
-    wxWindow *FindSuitableParent() const;
+#endif // WXWIN_COMPATIBILITY_2_6
 
+protected:
     //
     // Common part of all ctors
     //
     void Init(void);
 
-    // end either modal or modeless dialog
-    void EndDialog(int rc);
-
 private:
     wxWindow*                       m_pOldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog
@@ -142,9 +113,7 @@ private:
     class wxWindowDisabler*         m_pWindowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxDialog)
+    wxDECLARE_NO_COPY_CLASS(wxDialog);
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_
-