Weekly catch up.

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

include/wx/os2/button.h

@@ -81,6 +81,13 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 protected:
 
     bool            SendClickEvent(void);
+    void            SetTmpDefault(void);
+    void            UnsetTmpDefault(void);
+
+    static void UpdateDefaultStyle( wxWindow* pWinDefault
+                                   ,wxWindow* pWinOldDefault
+                                  );
+
     virtual wxSize  DoGetBestSize(void) const;
     virtual WXDWORD OS2GetStyle( long     style
                                 ,WXDWORD* exstyle

include/wx/os2/popupwin.h

@@ -21,15 +21,20 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
 public:
     wxPopupWindow() { }
 
-    wxPopupWindow(wxWindow *parent) { (void)Create(parent); }
+    wxPopupWindow(wxWindow* pParent) { (void)Create(pParent); }
 
-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
-    {
-        return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
-                                wxDefaultPosition, wxDefaultSize,
-                                (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
-    }
-};
+    bool Create( wxWindow* pParent
+                ,int       nFlags = wxBORDER_NONE
+               );
+protected:
+    virtual void DoGetPosition( int* pnX
+                               ,int* pny
+                              ) const;
+
+    virtual WXDWORD OS2GetStyle( long     lFlags
+                                ,WXDWORD* dwExstyle
+                               ) const;
+    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
+}; // end of CLASS wxPopupWindow
 
 #endif // _WX_PM_POPUPWIN_H_

include/wx/os2/setup0.h

@@ -77,8 +77,8 @@
                                 // 0 for no drag and drop
 
 #define wxUSE_CONTROLS     1    // Do not change
-#define wxUSE_POPUPWIN     0    // OS/2 does not use this
-#define wxUSE_TIPWINDOW    0    // hence this is unavailable
+#define wxUSE_POPUPWIN     1    //
+#define wxUSE_TIPWINDOW    1    //
 
 // Recommended setting: 1
 #define wxUSE_BUTTON       1    // wxButton