Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-08-21 11:08:33 +00:00
parent deb818d619
commit 760ac9abdd
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/os2/frame.h
View File

@@ -197,6 +197,8 @@ protected:
int m_nFsToolBarHeight;
bool m_bFsIsMaximized;
bool m_bFsIsShowing;
bool m_bIsShown;
wxWindow* m_pWinLastFocused;
private:
#if wxUSE_TOOLTIPS

3
src/Wxwindll.icc
View File

@@ -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\\QUANTIZE.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\\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"

6
src/os2/makefile.va
View File

@@ -130,7 +130,7 @@ GENERICOBJS= \
..\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
@@ -173,7 +173,7 @@ GENLIBOBJS= \
tbarsmpl.obj \
textdlgg.obj \
tipdlg.obj \
treectrl.obj \
treectlg.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\treectrl.obj
copy ..\generic\$D\treectlg.obj
copy ..\generic\$D\treelay.obj
copy ..\generic\$D\wizard.obj

14
src/os2/menu.cpp
View File

@@ -296,7 +296,7 @@ bool wxMenu::DoInsertOrAppend(
if (pItem->IsSeparator())
{
vItem.afStyle |= MIS_SEPARATOR;
rItem.afStyle |= MIS_SEPARATOR;
}
//
@@ -304,20 +304,18 @@ bool wxMenu::DoInsertOrAppend(
// required by ::MM_INSERTITEM message API
//
wxMenu* pSubmenu = pItem->GetSubMenu();
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
{
vItem.id = pItem->GetId();
rItem.id = pItem->GetId();
}
BYTE* pData;
@@ -340,7 +338,7 @@ bool wxMenu::DoInsertOrAppend(
//
// Menu is just a normal string (passed in data parameter)
//
vItem.afStyle |= MIS_TEXT;
rItem.afStyle |= MIS_TEXT;
pData = (char*)pItem->GetText().c_str();
}