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

Various compiler changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-03-15 18:52:23 +00:00
parent 2d8e9af9c9
commit 669f7a111f
27 changed files with 131 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demos/dbbrowse/dbgrid.cpp
View File

@@ -148,7 +148,7 @@ int DBGrid::OnTableView(wxString Table)
return 0; return 0;
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DBGrid::OnModusEdit(wxMenu& menu, wxCommandEvent& event) void DBGrid::OnModusEdit(wxCommandEvent& event)
{ {
b_EditModus = TRUE; // Needed by PopupMenu b_EditModus = TRUE; // Needed by PopupMenu
EnableEditing(b_EditModus); // Activate in-place Editing EnableEditing(b_EditModus); // Activate in-place Editing
@@ -156,7 +156,7 @@ void DBGrid::OnModusEdit(wxMenu& menu, wxCommandEvent& event)
// wxLogMessage(_("-I-> DBGrid::OnModusEdit() - End")); // wxLogMessage(_("-I-> DBGrid::OnModusEdit() - End"));
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DBGrid::OnModusBrowse(wxMenu& menu, wxCommandEvent& event) void DBGrid::OnModusBrowse(wxCommandEvent& event)
{ {
b_EditModus = FALSE; // Needed by PopupMenu b_EditModus = FALSE; // Needed by PopupMenu
EnableEditing(b_EditModus); // Deactivate in-place Editing EnableEditing(b_EditModus); // Deactivate in-place Editing

4
demos/dbbrowse/dbgrid.h
View File

@@ -34,8 +34,8 @@ class DBGrid: public wxGrid
wxString logBuf,Temp0; wxString logBuf,Temp0;
wxPoint MousePos; wxPoint MousePos;
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
void OnModusEdit(wxMenu& menu, wxCommandEvent& event); void OnModusEdit(wxCommandEvent& event);
void OnModusBrowse(wxMenu& menu, wxCommandEvent& event); void OnModusBrowse(wxCommandEvent& event);
void OnMouseMove(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event);
int OnTableView(wxString Table); int OnTableView(wxString Table);
//----- //-----

8
demos/dbbrowse/dbtree.cpp
View File

@@ -332,7 +332,7 @@ void DBTree::OnRightSelect(wxTreeEvent& WXUNUSED(event))
} }
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DBTree::OnDBGrid(wxMenu& , wxCommandEvent& event) void DBTree::OnDBGrid(wxCommandEvent& event)
{ {
int i; int i;
// Get the Information that we need // Get the Information that we need
@@ -354,7 +354,7 @@ void DBTree::OnDBGrid(wxMenu& , wxCommandEvent& event)
} }
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DBTree::OnDBClass(wxMenu& , wxCommandEvent& event) void DBTree::OnDBClass(wxCommandEvent& event)
{ {
// int i; // int i;
// Get the Information that we need // Get the Information that we need
@@ -367,7 +367,7 @@ void DBTree::OnDBClass(wxMenu& , wxCommandEvent& event)
} }
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DBTree::OnTableClass(wxMenu& , wxCommandEvent& event) void DBTree::OnTableClass(wxCommandEvent& event)
{ {
int i; int i;
// Get the Information that we need // Get the Information that we need
@@ -388,7 +388,7 @@ void DBTree::OnTableClass(wxMenu& , wxCommandEvent& event)
} }
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void DBTree::OnTableClassAll(wxMenu& , wxCommandEvent& event) void DBTree::OnTableClassAll(wxCommandEvent& event)
{ {
// int i; // int i;
// Get the Information that we need // Get the Information that we need

8
demos/dbbrowse/dbtree.h
View File

@@ -59,10 +59,10 @@ class DBTree : public wxTreeCtrl
int OnPopulate(); int OnPopulate();
void OnSelChanged(wxTreeEvent& event); void OnSelChanged(wxTreeEvent& event);
void OnRightSelect(wxTreeEvent& event); void OnRightSelect(wxTreeEvent& event);
void OnDBGrid(wxMenu& menu, wxCommandEvent& event); void OnDBGrid(wxCommandEvent& event);
void OnDBClass(wxMenu& menu, wxCommandEvent& event); void OnDBClass(wxCommandEvent& event);
void OnTableClass(wxMenu& menu, wxCommandEvent& event); void OnTableClass(wxCommandEvent& event);
void OnTableClassAll(wxMenu& menu, wxCommandEvent& event); void OnTableClassAll(wxCommandEvent& event);
void OnMouseEvent(wxMouseEvent& event); void OnMouseEvent(wxMouseEvent& event);
void OnMouseMove(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event);
public: public:

4
demos/dbbrowse/pgmctrl.cpp
View File

@@ -129,7 +129,7 @@ int PgmCtrl::OnPopulate()
return 0; return 0;
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void PgmCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event)) void PgmCtrl::OnSelChanged(wxMouseEvent& WXUNUSED(event))
{ {
int i; int i;
Temp0.Empty(); Temp1.Empty(); Temp0.Empty(); Temp1.Empty();
@@ -249,7 +249,7 @@ void PgmCtrl::OnMouseMove(wxMouseEvent &event)
TreePos = event.GetPosition(); TreePos = event.GetPosition();
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
void PgmCtrl::OnUserPassword() void PgmCtrl::OnUserPassword(wxCommandEvent& WXUNUSED(event))
{ {
// wxMessageBox(SaveDSN); // wxMessageBox(SaveDSN);
int i; int i;

4
demos/dbbrowse/pgmctrl.h
View File

@@ -49,10 +49,10 @@ class PgmCtrl : public wxTreeCtrl
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------
public: public:
int OnPopulate(); int OnPopulate();
void OnSelChanged(wxTreeEvent& event); void OnSelChanged(wxMouseEvent& event);
void OnRightSelect(wxTreeEvent& event); void OnRightSelect(wxTreeEvent& event);
void OnMouseMove(wxMouseEvent& event); void OnMouseMove(wxMouseEvent& event);
void OnUserPassword(); void OnUserPassword(wxCommandEvent& event);
public: public:
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------

6
distrib/msw/tmake/vc.t
View File

@@ -269,6 +269,9 @@ $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
@@ -281,6 +284,9 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp

2
distrib/msw/vc.rsp
View File

@@ -18,6 +18,8 @@ src/png/png.dsw
src/xpm/xpm.dsp src/xpm/xpm.dsp
src/xpm/xpm.dsw src/xpm/xpm.dsw
samples/SamplesVC.dsw
samples/calendar/CalendarVC.dsp samples/calendar/CalendarVC.dsp
samples/calendar/CalendarVC.dsw samples/calendar/CalendarVC.dsw

9
docs/msw/install.txt
View File

@@ -4,8 +4,8 @@ Installing wxWindows 2.1
This is a beta release of wxWindows 2.1 for Microsoft This is a beta release of wxWindows 2.1 for Microsoft
Windows 95, 98 and NT. This is not a production release, Windows 95, 98 and NT. This is not a production release,
although a huge number of bugs found in wxWindows 2.0 have been although a huge number of bugs found in earlier versions
fixed. of wxWindows have been fixed.
IMPORTANT NOTE: If you experience problems installing, please IMPORTANT NOTE: If you experience problems installing, please
re-read this instructions and other related files (release.txt, re-read this instructions and other related files (release.txt,
@@ -29,6 +29,7 @@ program contains the following:
- makefiles for most Windows compilers, plus BC++ and - makefiles for most Windows compilers, plus BC++ and
VC++ IDE files; VC++ IDE files;
- JPEG library source; - JPEG library source;
- TIFF library source;
- Object Graphics Library; - Object Graphics Library;
- Tex2RTF source; - Tex2RTF source;
- Dialog Editor binary. - Dialog Editor binary.
@@ -94,6 +95,10 @@ Using project files (VC++ 5 and 6 only):
Debug using Build | Set Active Configuration..., and compile. Debug using Build | Set Active Configuration..., and compile.
The project files don't use precompiled headers, to save disk The project files don't use precompiled headers, to save disk
space, but you can switch PCH compiling on for greater speed. space, but you can switch PCH compiling on for greater speed.
NOTE: you may also use samples/SamplesVC.dsw to access all
sample projects without opening each workspace individually.
You can use the Batch Build facility to make several samples
at a time.
Using makefiles: Using makefiles:

1
include/wx/event.h
View File

@@ -1591,6 +1591,7 @@ typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEv
typedef void (wxEvtHandler::*wxWindowCreateEventFunction)(wxWindowCreateEvent&); typedef void (wxEvtHandler::*wxWindowCreateEventFunction)(wxWindowCreateEvent&);
typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&); typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&);
typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&); typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&);
typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&);
#endif // wxUSE_GUI #endif // wxUSE_GUI
// N.B. In GNU-WIN32, you *have* to take the address of a member function // N.B. In GNU-WIN32, you *have* to take the address of a member function

46
include/wx/generic/plot.h
View File

@@ -348,30 +348,32 @@ private:
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// calendar events macros // plot event macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define EVT_PLOT(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, typedef void (wxEvtHandler::*wxPlotEventFunction)(wxPlotEvent&);
#define EVT_PLOT_SEL_CHANGING(id, fn) { wxEVT_PLOT_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_SEL_CHANGED(id, fn) { wxEVT_PLOT_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_CLICKED(id, fn) { wxEVT_PLOT_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_SEL_CHANGING(id, fn) { wxEVT_PLOT_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_DOUBLECLICKED(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_SEL_CHANGED(id, fn) { wxEVT_PLOT_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_ZOOM_IN(id, fn) { wxEVT_PLOT_ZOOM_IN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_CLICKED(id, fn) { wxEVT_PLOT_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_ZOOM_OUT(id, fn) { wxEVT_PLOT_ZOOM_OUT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_DOUBLECLICKED(id, fn) { wxEVT_PLOT_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_VALUE_SEL_CREATING(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_ZOOM_IN(id, fn) { wxEVT_PLOT_ZOOM_IN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_VALUE_SEL_CREATED(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_ZOOM_OUT(id, fn) { wxEVT_PLOT_ZOOM_OUT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_VALUE_SEL_CREATING(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_VALUE_SEL_CREATED(id, fn) { wxEVT_PLOT_VALUE_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_AREA_SEL_CREATING(id, fn) { wxEVT_PLOT_AREA_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_VALUE_SEL_CHANGING(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_AREA_SEL_CREATED(id, fn) { wxEVT_PLOT_AREA_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_VALUE_SEL_CHANGED(id, fn) { wxEVT_PLOT_VALUE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_AREA_SEL_CHANGING(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_AREA_SEL_CREATING(id, fn) { wxEVT_PLOT_AREA_SEL_CREATING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_AREA_SEL_CHANGED(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_AREA_SEL_CREATED(id, fn) { wxEVT_PLOT_AREA_SEL_CREATED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_AREA_SEL_CHANGING(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_END_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_AREA_SEL_CHANGED(id, fn) { wxEVT_PLOT_AREA_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_BEGIN_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_END_X_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_X_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) { wxEVT_PLOT_BEGIN_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_BEGIN_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_BEGIN_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_END_TITLE_EDIT(id, fn) { wxEVT_PLOT_END_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_PLOT_END_Y_LABEL_EDIT(id, fn) { wxEVT_PLOT_END_Y_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_BEGIN_TITLE_EDIT(id, fn) { wxEVT_PLOT_BEGIN_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#define EVT_PLOT_END_TITLE_EDIT(id, fn) { wxEVT_PLOT_END_TITLE_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxNotifyEventFunction) (wxPlotEventFunction) & fn, (wxObject *) NULL },
#endif // wxUSE_PLOT #endif // wxUSE_PLOT

6
include/wx/msw/setup0.h
View File

@@ -580,6 +580,9 @@
#if defined(__WXMSW__) && defined(__WATCOMC__) #if defined(__WXMSW__) && defined(__WATCOMC__)
#undef wxUSE_LIBJPEG #undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0 #define wxUSE_LIBJPEG 0
#undef wxUSE_LIBTIFF
#define wxUSE_LIBTIFF 0
#endif #endif
#if defined(__WXMSW__) && !defined(__WIN32__) #if defined(__WXMSW__) && !defined(__WIN32__)
@@ -605,6 +608,9 @@
#undef wxUSE_LIBJPEG #undef wxUSE_LIBJPEG
#define wxUSE_LIBJPEG 0 #define wxUSE_LIBJPEG 0
#undef wxUSE_LIBTIFF
#define wxUSE_LIBTIFF 0
#undef wxUSE_GIF #undef wxUSE_GIF
#define wxUSE_GIF 0 #define wxUSE_GIF 0

3
samples/controls/controls.cpp
View File

@@ -616,7 +616,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
#ifndef __WXMOTIF__ // wxStaticBitmap not working under Motif yet. MB #if !defined(__WXMOTIF__) && !defined(__WIN16__) // wxStaticBitmap not working under Motif yet; and icons not allowed under WIN16.
wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon, wxStaticBitmap *bmpStatic = new wxStaticBitmap(panel, -1, icon,
wxPoint(10, 10)); wxPoint(10, 10));
@@ -642,6 +642,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
if (bitmap.Ok()) if (bitmap.Ok())
{ {
bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
(void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120)); (void)new wxStaticBitmap /* wxBitmapButton */ (panel, -1, bitmap, wxPoint(300, 120));
} }
#endif #endif

4
samples/makefile.b32
View File

@@ -112,6 +112,8 @@ all:
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\plot
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist
@@ -230,6 +232,8 @@ clean:
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\plot
make -f makefile.b32 clean
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist

4
samples/makefile.vc
View File

@@ -114,6 +114,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\plot
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist
@@ -232,6 +234,8 @@ clean:
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\png cd $(WXDIR)\samples\png
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\plot
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\printing cd $(WXDIR)\samples\printing
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\proplist cd $(WXDIR)\samples\proplist

7
samples/plot/plot.def Normal file
View File

@@ -0,0 +1,7 @@
NAME Plot
DESCRIPTION 'wxWindows Plot sample'
EXETYPE WINDOWS
CODE PRELOAD MOVEABLE DISCARDABLE
DATA PRELOAD MOVEABLE MULTIPLE
HEAPSIZE 4048
STACKSIZE 16000

2
samples/plot/plot.rc Normal file
View File

@@ -0,0 +1,2 @@
#include "wx/msw/wx.rc"

13
src/common/utilscmn.cpp
View File

@@ -48,8 +48,10 @@
#endif // wxUSE_GUI #endif // wxUSE_GUI
#endif // WX_PRECOMP #endif // WX_PRECOMP
#ifndef __WIN16__
#include "wx/process.h" #include "wx/process.h"
#include "wx/txtstrm.h" #include "wx/txtstrm.h"
#endif
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
@@ -970,7 +972,7 @@ wxWindowDisabler::wxWindowDisabler(wxWindow *winToSkip)
HWND hwndFG = ::GetForegroundWindow(); HWND hwndFG = ::GetForegroundWindow();
m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL; m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
#else #else
HWND hwndFG = ::GetTopWindow(); HWND hwndFG = ::GetTopWindow(0);
m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL; m_winTop = hwndFG ? wxFindWinFromHandle((WXHWND)hwndFG) : (wxWindow *)NULL;
#endif #endif
#endif // MSW #endif // MSW
@@ -1031,8 +1033,8 @@ wxWindowDisabler::~wxWindowDisabler()
{ {
// 16-bit SetForegroundWindow() replacement // 16-bit SetForegroundWindow() replacement
RECT reWin; RECT reWin;
GetWindowRect(m_winTop, &reWin); GetWindowRect((HWND) m_winTop, &reWin);
SetWindowPos (m_winTop, HWND_TOP, SetWindowPos ((HWND) m_winTop, HWND_TOP,
reWin.left, reWin.top, reWin.left, reWin.top,
reWin.right - reWin.left, reWin.bottom, reWin.right - reWin.left, reWin.bottom,
SWP_SHOWWINDOW); SWP_SHOWWINDOW);
@@ -1209,6 +1211,10 @@ wxString wxGetCurrentDir()
long wxExecute(const wxString& command, wxArrayString& output) long wxExecute(const wxString& command, wxArrayString& output)
{ {
#ifdef __WIN16__
wxFAIL_MSG("Sorry, this version of wxExecute not implemented on WIN16.");
return 0;
#else
// create a wxProcess which will capture the output // create a wxProcess which will capture the output
wxProcess *process = new wxProcess; wxProcess *process = new wxProcess;
process->Redirect(); process->Redirect();
@@ -1229,4 +1235,5 @@ long wxExecute(const wxString& command, wxArrayString& output)
} }
return rc; return rc;
#endif
} }

11
src/generic/logg.cpp
View File

@@ -674,7 +674,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
long style) long style)
: wxDialog(parent, -1, caption ) : wxDialog(parent, -1, caption )
{ {
if ( ms_details ) if ( ms_details.IsEmpty() )
{ {
// ensure that we won't try to call wxGetTranslation() twice // ensure that we won't try to call wxGetTranslation() twice
ms_details = _T("&Details"); ms_details = _T("&Details");
@@ -715,8 +715,11 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
m_btnDetails = new wxButton(this, wxID_MORE, ms_details + _T(" >>")); m_btnDetails = new wxButton(this, wxID_MORE, ms_details + _T(" >>"));
sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1); sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);
#ifndef __WIN16__
wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK)); wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE); sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE);
#endif
const wxString& message = messages.Last(); const wxString& message = messages.Last();
sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN); sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN);
sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN); sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN);
@@ -797,6 +800,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
wxICON_INFORMATION wxICON_INFORMATION
}; };
#ifndef __WIN16__
for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ ) for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
{ {
wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]); wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
@@ -806,6 +810,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
} }
m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL); m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
#endif
// and fill it // and fill it
wxString fmt = wxLog::GetTimestamp(); wxString fmt = wxLog::GetTimestamp();
@@ -818,7 +823,8 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
size_t count = m_messages.GetCount(); size_t count = m_messages.GetCount();
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
int image; int image = -1;
#ifndef __WIN16__
switch ( m_severity[n] ) switch ( m_severity[n] )
{ {
case wxLOG_Error: case wxLOG_Error:
@@ -832,6 +838,7 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
default: default:
image = 2; image = 2;
} }
#endif
m_listctrl->InsertItem(n, m_messages[n], image); m_listctrl->InsertItem(n, m_messages[n], image);
m_listctrl->SetItem(n, 1, m_listctrl->SetItem(n, 1,

2
src/makevc.env
View File

@@ -34,7 +34,7 @@ WAITFLAG=/w
# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally
#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) #WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION)
WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION) WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION)
WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER) WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER)
WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\ WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2 comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2

11
src/msw/icon.cpp
View File

@@ -142,7 +142,16 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
#else // Win16 #else // Win16
// there are some functions in curico.cpp which probably could be used // there are some functions in curico.cpp which probably could be used
// here... // here...
wxFAIL_MSG("not implemented"); // This probably doesn't work.
HBITMAP hBitmap = (HBITMAP) bmp.GetHBITMAP();
HICON hIcon = MakeIconFromBitmap((HINSTANCE) wxGetInstance(), hBitmap);
if (hIcon)
{
SetHICON((WXHICON)hIcon);
SetSize(bmp.GetWidth(), bmp.GetHeight());
}
// wxFAIL_MSG("Bitmap to icon conversion (including use of XPMs for icons) not implemented");
#endif // Win32/16 #endif // Win32/16
} }

6
src/msw/makefile.vc
View File

@@ -474,6 +474,9 @@ $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\hash.obj /c /Tp $(COMMDIR)\hash.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
@@ -486,6 +489,9 @@ $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
<<
cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\gridsel.obj /c /Tp $(GENDIR)\gridsel.cpp
<< <<
cl @<< cl @<<
$(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp

7
src/msw/statbmp.cpp
View File

@@ -85,6 +85,12 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
// be ignored by Windows // be ignored by Windows
wxIcon *icon = (wxIcon *)NULL; wxIcon *icon = (wxIcon *)NULL;
m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon)); m_isIcon = bitmap.IsKindOf(CLASSINFO(wxIcon));
#ifdef __WIN16__
wxASSERT_MSG( !m_isIcon, "Icons are not supported in wxStaticBitmap under WIN16." );
#endif
#ifndef __WIN16__
if ( !m_isIcon ) if ( !m_isIcon )
{ {
const wxBitmap& bmp = (const wxBitmap&)bitmap; const wxBitmap& bmp = (const wxBitmap&)bitmap;
@@ -97,6 +103,7 @@ bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
m_isIcon = TRUE; m_isIcon = TRUE;
} }
} }
#endif
#ifdef __WIN32__ #ifdef __WIN32__
// create a static control with either SS_BITMAP or SS_ICON style depending // create a static control with either SS_BITMAP or SS_ICON style depending

5
src/msw/window.cpp
View File

@@ -2684,10 +2684,15 @@ bool wxWindow::HandleSetCursor(WXHWND hWnd,
// first ask the user code - it may wish to set the cursor in some very // first ask the user code - it may wish to set the cursor in some very
// specific way (for example, depending on the current position) // specific way (for example, depending on the current position)
POINT pt; POINT pt;
#ifdef __WIN32__
if ( !::GetCursorPos(&pt) ) if ( !::GetCursorPos(&pt) )
{ {
wxLogLastError("GetCursorPos"); wxLogLastError("GetCursorPos");
} }
#else
// In WIN16 it doesn't return a value.
::GetCursorPos(&pt);
#endif
int x = pt.x, int x = pt.x,
y = pt.y; y = pt.y;

4
utils/projgen/makeproj.cpp
View File

@@ -293,7 +293,7 @@ void MyApp::GenerateSamples(const wxString& dir)
GenerateSample("TextVC", "text", dir + wxString("/samples/text"), wxStringList("text.cpp", 0)); GenerateSample("TextVC", "text", dir + wxString("/samples/text"), wxStringList("text.cpp", 0));
GenerateSample("ThreadVC", "thread", dir + wxString("/samples/thread"), wxStringList("thread.cpp", 0)); GenerateSample("ThreadVC", "thread", dir + wxString("/samples/thread"), wxStringList("thread.cpp", 0));
GenerateSample("ToolbarVC", "toolbar", dir + wxString("/samples/toolbar"), wxStringList("toolbar.cpp", 0)); GenerateSample("ToolbarVC", "toolbar", dir + wxString("/samples/toolbar"), wxStringList("toolbar.cpp", 0));
GenerateSample("TreectrlVC", "treetest", dir + wxString("/samples/treectrl"), wxStringList("treetest.cpp", "treetest.h", 0)); GenerateSample("TreectrlVC", "treectrl", dir + wxString("/samples/treectrl"), wxStringList("treectrl.cpp", "treetest.h", 0));
GenerateSample("TypetestVC", "typetest", dir + wxString("/samples/typetest"), wxStringList("typetest.cpp", "typetest.h", 0)); GenerateSample("TypetestVC", "typetest", dir + wxString("/samples/typetest"), wxStringList("typetest.cpp", "typetest.h", 0));
GenerateSample("ValidateVC", "validate", dir + wxString("/samples/validate"), wxStringList("validate.cpp", "validate.h", 0)); GenerateSample("ValidateVC", "validate", dir + wxString("/samples/validate"), wxStringList("validate.cpp", "validate.h", 0));
GenerateSample("ClientVC", "client", dir + wxString("/samples/sockets"), wxStringList("client.cpp", 0)); GenerateSample("ClientVC", "client", dir + wxString("/samples/sockets"), wxStringList("client.cpp", 0));
@@ -303,7 +303,7 @@ void MyApp::GenerateSamples(const wxString& dir)
GenerateSample("CaretVC", "caret", dir + wxString("/samples/caret"), wxStringList("caret.cpp", 0)); GenerateSample("CaretVC", "caret", dir + wxString("/samples/caret"), wxStringList("caret.cpp", 0));
GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0)); GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0));
GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0)); GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0));
GenerateSample("WizardVC", "wiztest", dir + wxString("/samples/wizard"), wxStringList("wiztest.cpp", 0)); GenerateSample("WizardVC", "wizard", dir + wxString("/samples/wizard"), wxStringList("wizard.cpp", 0));
GenerateSample("RotateVC", "rotate", dir + wxString("/samples/rotate"), wxStringList("rotate.cpp", 0)); GenerateSample("RotateVC", "rotate", dir + wxString("/samples/rotate"), wxStringList("rotate.cpp", 0));
GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0)); GenerateSample("ExecVC", "exec", dir + wxString("/samples/exec"), wxStringList("exec.cpp", 0));
GenerateSample("FontVC", "font", dir + wxString("/samples/font"), wxStringList("font.cpp", 0)); GenerateSample("FontVC", "font", dir + wxString("/samples/font"), wxStringList("font.cpp", 0));

105
utils/projgen/makeproj.dsp
View File

@@ -1,105 +0,0 @@
# Microsoft Developer Studio Project File - Name="makeproj" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=makeproj - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "makeproj.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "makeproj.mak" CFG="makeproj - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "makeproj - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "makeproj - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "makeproj - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "makeproj - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir ""
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "makeproj - Win32 Release"
# Name "makeproj - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=.\makeproj.cpp
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

29
utils/projgen/makeproj.dsw
View File

@@ -1,29 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "makeproj"=.\makeproj.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################