Various wxCollapsiblePane enhancements (re-patch 1577412):

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

diff --git a/include/wx/os2/dialog.h b/include/wx/os2/dialog.h
index 0706163a56f2650e99d8b6bbc01a7b4ad7eed935..7c34ac348002e3384024afd7558c67bf81d41760 100644 (file)
--- a/include/wx/os2/dialog.h
+++ b/include/wx/os2/dialog.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.h
+// Name:        wx/os2/dialog.h

 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxDialog class
 // Author:      David Webster
 // Modified by:


@@ -14,7 +14,7 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxDialogNameStr[];

 
 class WXDLLEXPORT wxDialogModalData;
 
 
 class WXDLLEXPORT wxDialogModalData;
 


@@ -65,24 +65,6 @@ public:
     // override some base class virtuals
     virtual bool Show(bool show = true);
 
     // 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
     //
     //
     // Callbacks
     //


@@ -90,8 +72,7 @@ public:
                                   ,WXWPARAM wParam
                                   ,WXLPARAM lParam
                                  );
                                   ,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
 
     // Constructor with a modal flag, but no window id - the old convention
     wxDEPRECATED( wxDialog( wxWindow*       pParent


@@ -111,6 +92,8 @@ public:
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 protected:
     //
     // find the window to use as parent for this dialog if none has been
 protected:
     //
     // find the window to use as parent for this dialog if none has been


@@ -125,9 +108,6 @@ protected:
     //
     void Init(void);
 
     //
     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
 private:
     wxWindow*                       m_pOldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog


@@ -142,9 +122,7 @@ private:
     class wxWindowDisabler*         m_pWindowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
     class wxWindowDisabler*         m_pWindowDisabler;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)

-    DECLARE_EVENT_TABLE()

     DECLARE_NO_COPY_CLASS(wxDialog)
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_
     DECLARE_NO_COPY_CLASS(wxDialog)
 }; // end of CLASS wxDialog
 
 #endif // _WX_DIALOG_H_

-