AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no message

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2000-03-10 06:23:53 +00:00
parent 02d15cad11
commit d853016702
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/wx214.def
View File

@ -8710,10 +8710,6 @@ EXPORTS
CreateHelpWindow__20wxHtmlHelpControllerFv
;wxHtmlHelpController::ReadCustomization(wxConfigBase*,const wxString&)
ReadCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
;wxHtmlHelpController::sm_classwxHtmlHelpController
sm_classwxHtmlHelpController__20wxHtmlHelpController
;wxHtmlHelpController::sm_eventTable
sm_eventTable__20wxHtmlHelpController
;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&)
WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&)
@ -8722,14 +8718,10 @@ EXPORTS
wxConstructorForwxHtmlHelpController__Fv
;wxHtmlHelpController::~wxHtmlHelpController()
__dt__20wxHtmlHelpControllerFv
;wxHtmlHelpController::GetEventTable() const
GetEventTable__20wxHtmlHelpControllerCFv
;wxHtmlHelpController::OnCloseFrame(wxCloseEvent&)
OnCloseFrame__20wxHtmlHelpControllerFR12wxCloseEvent
;wxHtmlHelpController::wxHtmlHelpController(int)
__ct__20wxHtmlHelpControllerFi
;wxHtmlHelpController::sm_eventTableEntries
sm_eventTableEntries__20wxHtmlHelpController
;wxHtmlHelpController::SetTitleFormat(const wxString&)
SetTitleFormat__20wxHtmlHelpControllerFRC8wxString
;From object file: ..\html\helpdata.cpp

4
src/os2/frame.cpp
View File

@ -362,7 +362,7 @@ bool wxFrame::Show(
wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
::WinQueryWindowPos(GetHwnd(), &vSwp);
m_bIconized = vSwp & SWP_MINIMIZE;
m_bIconized = vSwp.fl & SWP_MINIMIZE;
::WinSetWindowPos( (HWND) GetHWND()
,HWND_TOP
,vSwp.x
@ -384,7 +384,7 @@ bool wxFrame::Show(
HWND hWndParent = GetHwndOf(GetParent());
::WinQueryWindowPos(hWndParent, &vSwp);
m_bIconized = vSwp & SWP_MINIMIZE;
m_bIconized = vSwp.fl & SWP_MINIMIZE;
if (hWndParent)
::WinSetWindowPos( hWndParent
,HWND_TOP

20
src/os2/makefile.va
View File

@ -606,7 +606,7 @@ HTMLLIBOBJS = \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
@ -960,7 +960,7 @@ $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
ilib $(LIBFLAGS) $@ @<<
$**;
<<
# del *.obj
del *.obj
$(WXDIR)\lib\wx.lib: \
$D\dummy.obj \
@ -978,14 +978,14 @@ $(WXDIR)\lib\wx.lib: \
ilib $(LIBFLAGS) $@ @<<
$**;
<<
# del $(COMTEMPTGT1)
# del $(COMTEMPTGT2)
# del $(COMTEMPTGT3)
# del $(GENTEMPTGT)
# del $(HTMLTEMPTGT)
# del $(NONESTEMPTGT)
# del $(OS2TEMPTGT1)
# del $(OS2TEMPTGT2)
del $(COMTEMPTGT1)
del $(COMTEMPTGT2)
del $(COMTEMPTGT3)
del $(GENTEMPTGT)
del $(HTMLTEMPTGT)
del $(NONESTEMPTGT)
del $(OS2TEMPTGT1)
del $(OS2TEMPTGT2)
!else