Get the right dialogs into OS/2

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 4191b61e04387876751ffa83d3af51174e3cef50..88cac74d0fa8c712f37764bc2e629ac5b9f9cded 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -116,7 +116,6 @@ public:
                           ,WXHMENU hMenu
                          );
 
                           ,WXHMENU hMenu
                          );
 

-    void SendSizeEvent(void);

     // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
     // tooltip management
 #if wxUSE_TOOLTIPS
     WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index ea8d31fe4b5e6e35d5d64039c8beff8ea2a3b625..4efd8d7da7394b42fd5ec98c414c4c330a7deef2 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -315,6 +315,9 @@
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 
 // text entry dialog and wxGetTextFromUser function
 #define wxUSE_TEXTDLG 1
 

+// use the number dialog
+#define wxUSE_NUMBERDLG 1
+

 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
 // wxToolBar class
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 8f49bb12fe195584d9a2074e1c74cc44a1bf9aba..7ad9f88570a88246528a974915e926056daaad3e 100644 (file)
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -16,7 +16,7 @@
     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 

-enum ETemplateID { kResizeableDialog = 1000
+enum ETemplateID { kResizeableDialog = 127

                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };
                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };


@@ -65,6 +65,7 @@ public:
            virtual bool IsMaximized(void) const;
            virtual void Maximize(bool bMaximize = TRUE);
            virtual void Restore(void);
            virtual bool IsMaximized(void) const;
            virtual void Maximize(bool bMaximize = TRUE);
            virtual void Restore(void);

+           virtual void SendSizeEvent(void);

            virtual void SetIcon(const wxIcon& rIcon);
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow
            virtual void SetIcon(const wxIcon& rIcon);
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow