*** empty log message ***

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

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 2b5dea94836813f8735878cea0b7cbad1024f072..12d2e8d66b1c6ae24240c9c3e54c08823d4e0605 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -216,6 +216,7 @@ public:
     // on a listbox)
     virtual void OnDefaultAction(wxControl *initiatingItem);
 
     // on a listbox)
     virtual void OnDefaultAction(wxControl *initiatingItem);
 

+    // EventHandlers

     void OnEraseBackground(wxEraseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnKeyDown(wxKeyEvent& event);
     void OnEraseBackground(wxEraseEvent& event);
     void OnChar(wxKeyEvent& event);
     void OnKeyDown(wxKeyEvent& event);


@@ -283,8 +284,10 @@ public:
 
 DECLARE_EVENT_TABLE()
 private:
 
 DECLARE_EVENT_TABLE()
 private:

-    void Init();
-    void PMDetachWindowMenu();
+    void   Init();
+    void   PMDetachWindowMenu();
+    WXHWND GetHwnd() const { return m_hWnd; }
+    void   SetHwnd(WXHWND hWnd) { m_hWnd = hWnd; }

 };
 
 ////////////////////////////////////////////////////////////////////////
 };
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index f7869200e8d6c0643e1babd7b4881fdc589111ba..1d9e08b01652970c255702f9aca4637d4d5123eb 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -267,6 +267,7 @@ pch1:   dirs $(DUMMYOBJ)
 ### Static library
 
 $(WXDIR)\lib\wx.lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
 ### Static library
 
 $(WXDIR)\lib\wx.lib: $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)

+ touch $(LIBTARGET)

  del $(LIBTARGET)
  ilib $(LINKFLAGS) $@ @<<
     $**
  del $(LIBTARGET)
  ilib $(LINKFLAGS) $@ @<<
     $**

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index f46f05ddda43568b51a85ff84a1d2a174ff1fa59..4a04ebeca9269088b7799095eae0d7467a88df60 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -214,7 +214,7 @@ void wxWindow::ReleaseMouse()
     // TODO:
 }
 
     // TODO:
 }
 

-void wxWindow::Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)

 {
     // TODO:
 }
 {
     // TODO:
 }


@@ -245,9 +245,9 @@ int  wxWindow::GetCharWidth() const
 void wxWindow::GetTextExtent( const wxString& string
                              ,int*            x
                              ,int*            y
 void wxWindow::GetTextExtent( const wxString& string
                              ,int*            x
                              ,int*            y

-                             ,int*            descent = NULL
-                             ,int*            externalLeading = NULL
-                             ,const wxFont*   theFont = NULL
+                             ,int*            descent
+                             ,int*            externalLeading
+                             ,const wxFont*   theFont

                             ) const
 {
     // TODO:
                             ) const
 {
     // TODO:


@@ -257,7 +257,7 @@ void wxWindow::SetScrollbar( int  orient
                             ,int  pos
                             ,int  thumbVisible
                             ,int  range
                             ,int  pos
                             ,int  thumbVisible
                             ,int  range

-                            ,bool refresh = TRUE
+                            ,bool refresh

                            )
 {
     // TODO:
                            )
 {
     // TODO:


@@ -265,7 +265,7 @@ void wxWindow::SetScrollbar( int  orient
 
 void wxWindow::SetScrollPos( int  orient
                             ,int  pos
 
 void wxWindow::SetScrollPos( int  orient
                             ,int  pos

-                            ,bool refresh = TRUE
+                            ,bool refresh

                            )
 {
     // TODO:
                            )
 {
     // TODO:


@@ -291,7 +291,7 @@ int  wxWindow::GetScrollThumb(int orient) const
 
 void wxWindow::ScrollWindow( int           dx
                             ,int           dy
 
 void wxWindow::ScrollWindow( int           dx
                             ,int           dy

-                            ,const wxRect* rect = NULL
+                            ,const wxRect* rect

                            )
 {
     // TODO:
                            )
 {
     // TODO:


@@ -331,7 +331,7 @@ void wxWindow::DoGetClientSize( int *width, int *height ) const
 
 void wxWindow::DoSetSize(int x, int y,
                          int width, int height,
 
 void wxWindow::DoSetSize(int x, int y,
                          int width, int height,

-                         int sizeFlags = wxSIZE_AUTO)
+                         int sizeFlags)

 {
     // TODO:
 }
 {
     // TODO:
 }


@@ -378,8 +378,9 @@ bool wxWindow::Validate()
 
 wxWindow* wxWindow::FindFocus()
 {
 
 wxWindow* wxWindow::FindFocus()
 {

+    wxWindow*                       window = NULL;

     // TODO:
     // TODO:

-    return(this);
+    return(window);

 }
 
 void wxWindow::DragAcceptFiles(bool accept)
 }
 
 void wxWindow::DragAcceptFiles(bool accept)


@@ -491,7 +492,7 @@ void wxWindow::UnsetConstraints(wxLayoutConstraints *c)
 wxObject* wxWindow::GetChild(int number) const
 {
     // TODO:
 wxObject* wxWindow::GetChild(int number) const
 {
     // TODO:

-    return(this);
+    return((wxObject*)this);

 }
 
 void wxWindow::PMDetachWindowMenu()
 }
 
 void wxWindow::PMDetachWindowMenu()


@@ -500,12 +501,12 @@ void wxWindow::PMDetachWindowMenu()
     {
         HMENU hMenu = (HMENU)m_hMenu;
 
     {
         HMENU hMenu = (HMENU)m_hMenu;
 

-        int N = ::GetMenuItemCount(hMenu);
+        int N = (int)WinSendMsg(hMenu, MM_QUERYITEMCOUNT, 0, 0);

         int i;
         for (i = 0; i < N; i++)
         {
             wxChar buf[100];
         int i;
         for (i = 0; i < N; i++)
         {
             wxChar buf[100];

-            int chars = GetMenuString(hMenu, i, buf, 100, MF_BYPOSITION);
+            int chars = (int)WinSendMsg(hMenu, MM_QUERYITEMTEXT, MPFROM2SHORT(i, N), buf);

             if ( !chars )
             {
                 wxLogLastError(_T("GetMenuString"));
             if ( !chars )
             {
                 wxLogLastError(_T("GetMenuString"));


@@ -515,13 +516,13 @@ void wxWindow::PMDetachWindowMenu()
 
             if ( wxStrcmp(buf, _T("&Window")) == 0 )
             {
 
             if ( wxStrcmp(buf, _T("&Window")) == 0 )
             {

-                RemoveMenu(hMenu, i, MF_BYPOSITION);
-
+                WinSendMsg(hMenu, MM_DELETEITEM, MPFROM2SHORT(i, TRUE), 0);

                 break;
             }
         }
     }
 }
                 break;
             }
         }
     }
 }

+

 void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
 {
     // adding NULL hWnd is (first) surely a result of an error and
 void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win)
 {
     // adding NULL hWnd is (first) surely a result of an error and