Applied patch [ 670782 ] Combobox uses popup window width

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

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 4224ed63b716f44936d3bf89343acc44b26ec063..0ab1d94d197103a26ad18949ee16ac291afacead 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 = 127
+enum ETemplateID { kResizeableDialog = 130

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


@@ -67,7 +67,7 @@ public:
            virtual void Restore(void);
            virtual void SendSizeEvent(void);
            virtual void SetIcon(const wxIcon& rIcon);
            virtual void Restore(void);
            virtual void SendSizeEvent(void);
            virtual void SetIcon(const wxIcon& rIcon);

-    inline virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
+           virtual void SetIcons(const wxIconBundle& rIcons);

 
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow
 
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow


@@ -86,6 +86,11 @@ public:
     // --------------------------
     //
            PSWP         GetSwpClient(void) { return &m_vSwpClient; }
     // --------------------------
     //
            PSWP         GetSwpClient(void) { return &m_vSwpClient; }

+
+           void         OnActivate(wxActivateEvent& rEvent);
+
+           void         SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; }
+           wxWindow*    GetLastFocus(void) const { return m_pWinLastFocused; }

 protected:
     //
     // Common part of all ctors
 protected:
     //
     // Common part of all ctors


@@ -131,6 +136,12 @@ protected:
     virtual WXDWORD OS2GetStyle( long     lFlag
                                 ,WXDWORD* pdwExstyle
                                ) const;
     virtual WXDWORD OS2GetStyle( long     lFlag
                                 ,WXDWORD* pdwExstyle
                                ) const;

+
+    //
+    // Choose the right parent to use with CreateWindow()
+    //
+    virtual WXHWND  OS2GetParent(void) const;
+

     //
     // Is the frame currently iconized?
     //
     //
     // Is the frame currently iconized?
     //


@@ -151,10 +162,15 @@ protected:
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
 
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
 

+    wxWindow*                       m_pWinLastFocused;
+

     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
     static bool                     m_sbInitialized;
     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
     static bool                     m_sbInitialized;

+    static wxWindow*                m_spHiddenParent;
+
+    DECLARE_EVENT_TABLE()

 }; // end of CLASS wxTopLevelWindowOS2
 
 //
 }; // end of CLASS wxTopLevelWindowOS2
 
 //