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

Solving link problem with 16 bits versions (wxProcessEvent, wxSpinEvent)

Browse Source 
Various makefile.dos in Samples/ dir are now up-to-date
msvc\Ctl3dv2.lib changed to a valid one


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Patrick Albert
1999-08-26 17:05:33 +00:00
parent a6f3598d2b
commit 3372145d9d
8 changed files with 243 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/winundef.h
View File

@@ -187,6 +187,16 @@
} }
#endif #endif
// IsMaximized
#ifdef IsMaximized
#undef IsMaximized
inline BOOL IsMaximized(HWND hwnd)
{
return IsZoomed(hwnd);
}
#endif
// For WINE // For WINE
#if defined(GetWindowStyle) || defined(__WXWINE__) #if defined(GetWindowStyle) || defined(__WXWINE__)

3
samples/bombs/makefile.dos
View File

@@ -11,8 +11,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=bombs TARGET=bombs
OBJECTS=dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\ OBJECTS = $(TARGET).obj bombs1.obj game.obj
winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
!include $(WXDIR)\src\makeprog.msc !include $(WXDIR)\src\makeprog.msc

2
samples/controls/controls.cpp
View File

@@ -23,7 +23,9 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#if !defined( __WXMSW__ ) || defined( __WIN95__ )
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#endif
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/imaglist.h" #include "wx/imaglist.h"

3
samples/dynamic/dynamic.def
View File

@@ -1,4 +1,4 @@
NAME Dynamic NAME Dynamik
DESCRIPTION 'Dynamic event handler test' DESCRIPTION 'Dynamic event handler test'
EXETYPE WINDOWS EXETYPE WINDOWS
STUB 'WINSTUB.EXE' STUB 'WINSTUB.EXE'
@@ -6,3 +6,4 @@ CODE PRELOAD MOVEABLE DISCARDABLE
DATA PRELOAD MOVEABLE MULTIPLE DATA PRELOAD MOVEABLE MULTIPLE
HEAPSIZE 4048 HEAPSIZE 4048
STACKSIZE 16000 STACKSIZE 16000

300
samples/makefile.dos
View File

@@ -16,145 +16,283 @@ WXDIR = $(WXWIN)
THISDIR=$(WXDIR)\samples THISDIR=$(WXDIR)\samples
#
# Indicates kind of pb with samples
#
# No makefile.dos file
NOMAKE=1
# No 16 bit version
ONLY32=1
# PNG unresolved
PNGSETUP=1
# DND not set in setup.h
DNDSETUP=1
# Misc. compilation errors
COMPIL=1
!include $(WXDIR)\src\makemsc.env !include $(WXDIR)\src\makemsc.env
#
# Please keep samples list up-to-date, in alphabetical order
#
all: all:
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\bombs
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\caret
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\checklst
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\config
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\controls
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\listctrl !if "$(COMPIL)"==""
cd $(WXDIR)\samples\db
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\treectrl !endif
nmake -f makefile.dos FINAL=$(FINAL) cd $(WXDIR)\samples\dde
cd $(WXDIR)\samples\validate
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\mdi
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\minimal
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\layout
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\printing
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\toolbar
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!if "$(DNDSETUP)"==""
cd $(WXDIR)\samples\dnd
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\docview cd $(WXDIR)\samples\docview
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\docvwmdi cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\drawing
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\dynamic
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\forty
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\fractal
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\grid cd $(WXDIR)\samples\grid
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\internat !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\help
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\dnd cd $(WXDIR)\samples\html
nmake -f makefile.dos FINAL=$(FINAL)
!endif
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\image
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\internat
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\taskbar cd $(WXDIR)\samples\layout
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\listctrl
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\mdi
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!if "$(FINAL)" == "0" !if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck cd $(WXDIR)\samples\memcheck
nmake -f makefile.dos FINAL=$(FINAL)
!endif !endif
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\mfc
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\ownerdrw !endif
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\checklst
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\minifram cd $(WXDIR)\samples\minifram
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\bombs cd $(WXDIR)\samples\minimal
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\fractal !if "$(ONLY32)"==""
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\wxpoem !endif
cd $(WXDIR)\samples\notebook
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\typetest !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\oleauto
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\png
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\printing
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\image !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\regtest
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\dde !endif
cd $(WXDIR)\samples\resource
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
# cd $(WXDIR)\samples\regtest !if "$(NOMAKE)"==""
# nmake -f makefile.dos FINAL=$(FINAL) cd $(WXDIR)\samples\richedit
nmake -f makefile.dos FINAL=$(FINAL)
clean: cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos FINAL=$(FINAL)
!endif
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\scroll
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\splitter cd $(WXDIR)\samples\splitter
nmake -f makefile.dos clean nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\mdi !if "$(COMPIL)"==""
nmake -f makefile.dos clean cd $(WXDIR)\samples\tab
cd $(WXDIR)\samples\minimal nmake -f makefile.dos FINAL=$(FINAL)
nmake -f makefile.dos clean cd $(WXDIR)\samples\taskbar
cd $(WXDIR)\samples\layout nmake -f makefile.dos FINAL=$(FINAL)
nmake -f makefile.dos clean !endif
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\text
nmake -f makefile.dos clean nmake -f makefile.dos FINAL=$(FINAL)
!if "$(ONLY32)"==""
cd $(WXDIR)\samples\thread
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\toolbar cd $(WXDIR)\samples\toolbar
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(PNGSETUP)"==""
cd $(WXDIR)\samples\treectrl
nmake -f makefile.dos FINAL=$(FINAL)
!endif
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\typetest
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\validate
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\wizard
nmake -f makefile.dos FINAL=$(FINAL)
!endif
cd $(WXDIR)\samples\wxpoem
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\wxsocket
nmake -f makefile.dos FINAL=$(FINAL)
!endif
clean:
cd $(WXDIR)\samples\bombs
nmake -f makefile.dos clean
cd $(WXDIR)\samples\caret
nmake -f makefile.dos clean
cd $(WXDIR)\samples\checklst
nmake -f makefile.dos clean
cd $(WXDIR)\samples\config
nmake -f makefile.dos clean
cd $(WXDIR)\samples\controls
nmake -f makefile.dos clean
cd $(WXDIR)\samples\db
nmake -f makefile.dos clean
cd $(WXDIR)\samples\dde
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\dialogs cd $(WXDIR)\samples\dialogs
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\dnd
nmake -f makefile.dos clean
cd $(WXDIR)\samples\listctrl
nmake -f makefile.dos clean
cd $(WXDIR)\samples\treectrl
nmake -f makefile.dos clean
cd $(WXDIR)\samples\validate
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\docview cd $(WXDIR)\samples\docview
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\docvwmdi cd $(WXDIR)\samples\docvwmdi
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\controls cd $(WXDIR)\samples\drawing
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\nativdlg cd $(WXDIR)\samples\dynamic
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\grid cd $(WXDIR)\samples\forty
nmake -f makefile.dos clean
cd $(WXDIR)\samples\internat
nmake -f makefile.dos clean
cd $(WXDIR)\samples\checklst
nmake -f makefile.dos clean
cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.dos clean
cd $(WXDIR)\samples\dnd
nmake -f makefile.dos clean
cd $(WXDIR)\samples\joytest
nmake -f makefile.dos clean
cd $(WXDIR)\samples\regtest
nmake -f makefile.dos clean
cd $(WXDIR)\samples\taskbar
nmake -f makefile.dos clean
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos clean
cd $(WXDIR)\samples\memcheck
nmake -f makefile.dos clean
cd $(WXDIR)\samples\minifram
nmake -f makefile.dos clean
cd $(WXDIR)\samples\bombs
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\fractal cd $(WXDIR)\samples\fractal
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\wxpoem cd $(WXDIR)\samples\grid
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\typetest !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\help
nmake -f makefile.dos clean
cd $(WXDIR)\samples\html
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\image
nmake -f makefile.dos clean
cd $(WXDIR)\samples\internat
nmake -f makefile.dos clean
cd $(WXDIR)\samples\joytest
nmake -f makefile.dos clean
cd $(WXDIR)\samples\layout
nmake -f makefile.dos clean
cd $(WXDIR)\samples\listctrl
nmake -f makefile.dos clean
cd $(WXDIR)\samples\mdi
nmake -f makefile.dos clean
!if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\mfc
nmake -f makefile.dos clean
cd $(WXDIR)\samples\minifram
nmake -f makefile.dos clean
cd $(WXDIR)\samples\minimal
nmake -f makefile.dos clean
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.dos clean
cd $(WXDIR)\samples\notebook
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\oleauto
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\ownerdrw
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\png
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\printing
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\image !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\regtest
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\dde !endif
cd $(WXDIR)\samples\resource
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\richedit
nmake -f makefile.dos clean
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\scroll
nmake -f makefile.dos clean
cd $(WXDIR)\samples\splitter
nmake -f makefile.dos clean
cd $(WXDIR)\samples\tab
nmake -f makefile.dos clean
cd $(WXDIR)\samples\taskbar
nmake -f makefile.dos clean
cd $(WXDIR)\samples\text
nmake -f makefile.dos clean
cd $(WXDIR)\samples\thread
nmake -f makefile.dos clean
cd $(WXDIR)\samples\toolbar
nmake -f makefile.dos clean
cd $(WXDIR)\samples\treectrl
nmake -f makefile.dos clean
cd $(WXDIR)\samples\typetest
nmake -f makefile.dos clean
cd $(WXDIR)\samples\validate
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
cd $(WXDIR)\samples\wizard
nmake -f makefile.dos clean
!endif
cd $(WXDIR)\samples\wxpoem
nmake -f makefile.dos clean
cd $(WXDIR)\samples\wxsocket
nmake -f makefile.dos clean nmake -f makefile.dos clean

2
samples/text/makefile.dos
View File

@@ -10,7 +10,7 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
TARGET=controls TARGET=text
OBJECTS=$(TARGET).obj OBJECTS=$(TARGET).obj
!include $(WXDIR)\src\makeprog.msc !include $(WXDIR)\src\makeprog.msc

6
src/msw/makefile.dos
View File

@@ -131,6 +131,7 @@ COMMONOBJS = \
$(COMMDIR)\odbc.obj \ $(COMMDIR)\odbc.obj \
$(COMMDIR)\paper.obj \ $(COMMDIR)\paper.obj \
$(COMMDIR)\prntbase.obj \ $(COMMDIR)\prntbase.obj \
$(COMMDIR)\process.obj \
$(COMMDIR)\resource.obj \ $(COMMDIR)\resource.obj \
$(COMMDIR)\sizer.obj \ $(COMMDIR)\sizer.obj \
$(COMMDIR)\strconv.obj \ $(COMMDIR)\strconv.obj \
@@ -910,6 +911,11 @@ $(COMMDIR)/prntbase.obj: $*.$(SRCSUFF)
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<< <<
$(COMMDIR)/process.obj: $*.$(SRCSUFF)
cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
<<
$(COMMDIR)/resource.obj: $*.$(SRCSUFF) $(COMMDIR)/resource.obj: $*.$(SRCSUFF)
cl @<< cl @<<
$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF) $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

2
src/msw/nativdlg.cpp
View File

@@ -34,7 +34,9 @@
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#if defined(__WIN95__) && !defined(__TWIN32__)
#include "wx/spinbutt.h" #include "wx/spinbutt.h"
#endif
#include "wx/msw/private.h" #include "wx/msw/private.h"
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------