no message

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

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 94fe07be61f129c9e76b471b1c9aced3500bb8b0..be8181910a162148cc54f22bba8b1bf218d542d7 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -197,6 +197,8 @@ protected:
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
     int                             m_nFsToolBarHeight;
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;

+    bool                            m_bIsShown;
+    wxWindow*                       m_pWinLastFocused;

 
 private:
 #if wxUSE_TOOLTIPS
 
 private:
 #if wxUSE_TOOLTIPS

diff --git a/src/Wxwindll.icc b/src/Wxwindll.icc
index 84cf49d88d46be30b01fcc3b7f3c7d31d8aa578d..395b62dfc7f6b7d446c4b896310ec735b1435b2f 100644 (file)
--- a/src/Wxwindll.icc
+++ b/src/Wxwindll.icc
@@ -106,7 +106,6 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "COMMON\\PRNTBASE.CPP"
       source type(cpp) "COMMON\\PROCESS.CPP"
       source type(cpp) "COMMON\\PROTOCOL.CPP"
       source type(cpp) "COMMON\\PRNTBASE.CPP"
       source type(cpp) "COMMON\\PROCESS.CPP"
       source type(cpp) "COMMON\\PROTOCOL.CPP"

-      source type(cpp) "COMMON\\QUANTIZE.CPP"

       source type(cpp) "COMMON\\RESOURCE.CPP"
       source type(cpp) "COMMON\\SCKADDR.CPP"
       source type(cpp) "COMMON\\SCKFILE.CPP"
       source type(cpp) "COMMON\\RESOURCE.CPP"
       source type(cpp) "COMMON\\SCKADDR.CPP"
       source type(cpp) "COMMON\\SCKFILE.CPP"


@@ -180,7 +179,7 @@ option ProjectOptions = lang(longlong, "yes"),  gen(manglelinkagekeywordonlyfunc
       source type(cpp) "GENERIC\\TBARSMPL.CPP"
       source type(cpp) "GENERIC\\TEXTDLGG.CPP"
       source type(cpp) "GENERIC\\TIPDLG.CPP"
       source type(cpp) "GENERIC\\TBARSMPL.CPP"
       source type(cpp) "GENERIC\\TEXTDLGG.CPP"
       source type(cpp) "GENERIC\\TIPDLG.CPP"

-      source type(cpp) "GENERIC\\TREECTRL.CPP"
+      source type(cpp) "GENERIC\\TREECTLG.CPP"

       source type(cpp) "GENERIC\\TREELAY.CPP"
       source type(cpp) "GENERIC\\WIZARD.CPP"
       source type(cpp) "HTML\\HELPCTRL.CPP"
       source type(cpp) "GENERIC\\TREELAY.CPP"
       source type(cpp) "GENERIC\\WIZARD.CPP"
       source type(cpp) "HTML\\HELPCTRL.CPP"

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 2534fe84b60916bb7e3aef8751cee4655cbb2230..1bd843ce90c8b4bdcac943bbbdc488adfcb82e00 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -130,7 +130,7 @@ GENERICOBJS= \
   ..\generic\$D\tbarsmpl.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\tbarsmpl.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \

-  ..\generic\$D\treectrl.obj \
+  ..\generic\$D\treectlg.obj \

   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 
   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 


@@ -173,7 +173,7 @@ GENLIBOBJS= \
   tbarsmpl.obj \
   textdlgg.obj \
   tipdlg.obj \
   tbarsmpl.obj \
   textdlgg.obj \
   tipdlg.obj \

-  treectrl.obj \
+  treectlg.obj \

   treelay.obj \
   wizard.obj
 
   treelay.obj \
   wizard.obj
 


@@ -769,7 +769,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\tbarsmpl.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\tbarsmpl.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj

-  copy ..\generic\$D\treectrl.obj
+  copy ..\generic\$D\treectlg.obj

   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 
   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 

diff --git a/src/os2/menu.cpp b/src/os2/menu.cpp
index 78293daafaeb6fbdc4975edbbe5bddaabd039e72..5f2ddd5927d7b40f3577cd8602bf8012565883ee 100644 (file)
--- a/src/os2/menu.cpp
+++ b/src/os2/menu.cpp
@@ -275,7 +275,7 @@ bool wxMenu::DoInsertOrAppend(
     //
 
     wxMenu*                         pSubmenu = pItem->GetSubMenu();
     //
 
     wxMenu*                         pSubmenu = pItem->GetSubMenu();

-    MENUITEM   &rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:
+    MENUITEM&                       rItem = (pSubmenu != NULL)?pSubmenu->m_vMenuData:

                                             pItem->m_vMenuData;
     if(pSubmenu != NULL)
     {
                                             pItem->m_vMenuData;
     if(pSubmenu != NULL)
     {


@@ -296,7 +296,7 @@ bool wxMenu::DoInsertOrAppend(
 
     if (pItem->IsSeparator())
     {
 
     if (pItem->IsSeparator())
     {

-        vItem.afStyle |= MIS_SEPARATOR;
+        rItem.afStyle |= MIS_SEPARATOR;

     }
 
     //
     }
 
     //


@@ -304,20 +304,18 @@ bool wxMenu::DoInsertOrAppend(
     // required by ::MM_INSERTITEM message API
     //
 
     // required by ::MM_INSERTITEM message API
     //
 

-    wxMenu*                         pSubmenu = pItem->GetSubMenu();
-

     if (pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 
     if (pSubmenu != NULL)
     {
         wxASSERT_MSG(pSubmenu->GetHMenu(), wxT("invalid submenu"));
         pSubmenu->SetParent(this);
 

-        vItem.iPosition = 0; // submenus have a 0 position
-        vItem.id = (USHORT)pSubmenu->GetHMenu();
-        vItem.afStyle |= MIS_SUBMENU | MIS_TEXT;
+        rItem.iPosition = 0; // submenus have a 0 position
+        rItem.id = (USHORT)pSubmenu->GetHMenu();
+        rItem.afStyle |= MIS_SUBMENU | MIS_TEXT;

     }
     else
     {
     }
     else
     {

-        vItem.id = pItem->GetId();
+        rItem.id = pItem->GetId();

     }
 
     BYTE*                           pData;
     }
 
     BYTE*                           pData;


@@ -340,7 +338,7 @@ bool wxMenu::DoInsertOrAppend(
         //
         // Menu is just a normal string (passed in data parameter)
         //
         //
         // Menu is just a normal string (passed in data parameter)
         //

-        vItem.afStyle |= MIS_TEXT;
+        rItem.afStyle |= MIS_TEXT;

         pData = (char*)pItem->GetText().c_str();
     }
 
         pData = (char*)pItem->GetText().c_str();
     }