]> git.saurik.com Git - wxWidgets.git/commitdiff
Added OLE automation sample, changed BC++ makefiles
authorJulian Smart <julian@anthemion.co.uk>
Tue, 8 Dec 1998 18:49:20 +0000 (18:49 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Tue, 8 Dec 1998 18:49:20 +0000 (18:49 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

27 files changed:
samples/checklst/makefile.b32
samples/dialogs/makefile.b32
samples/docview/makefile.b32
samples/docvwmdi/makefile.b32
samples/grid/makefile.b32
samples/internat/makefile.b32
samples/joytest/makefile.b32
samples/layout/makefile.b32
samples/listctrl/makefile.b32
samples/mdi/makefile.b32
samples/memcheck/makefile.b32
samples/nativdlg/makefile.b32
samples/oleauto/makefile.b32 [new file with mode: 0644]
samples/oleauto/makefile.g95 [new file with mode: 0644]
samples/oleauto/makefile.nt [new file with mode: 0644]
samples/oleauto/mondrian.ico [new file with mode: 0644]
samples/oleauto/mondrian.xpm [new file with mode: 0644]
samples/oleauto/oleauto.cpp [new file with mode: 0644]
samples/oleauto/oleauto.def [new file with mode: 0644]
samples/oleauto/oleauto.rc [new file with mode: 0644]
samples/ownerdrw/makefile.b32
samples/printing/makefile.b32
samples/resource/makefile.b32
samples/splitter/makefile.b32
samples/toolbar/makefile.b32
samples/treectrl/makefile.b32
samples/validate/makefile.b32

index 51646091bd5bd1080bd672ef919c93a5d6a488f0..e591971c85ae348fae6ded9ee156144d029ba2ad 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=checklst
 
index 9adc7a3a59fcea79c3e73af6df793b35653ea49c..0663799ab8c0c010da99d50708a29c5f1c557b27 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB=$(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=dialogs
 
index af6ada9c794fa9ed7a4402b3e6cd631bbf28187e..e9654bdcb4cb0f7ee4dcf10755a83726696226b9 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB=$(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=docview
 
index af6ada9c794fa9ed7a4402b3e6cd631bbf28187e..e9654bdcb4cb0f7ee4dcf10755a83726696226b9 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB=$(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=docview
 
index 2b65f4cc5684269d996f1e2621c71d0ccdc3a2fb..56b22620bbff01c177a29f7e6603565ccc7a92ea 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
 
index 8f3f025fe1985144b9c9fed0dd75eca02a50764a..ae72e11b4b420c804e42f7d4d9d30d9e570dd0c3 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=internat
 
index 7720955b44085163a8aa6d0bb668c492ce34db99..59869b672a8e8a9502d1f1285d3b424038217b74 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=joytest
 
index b392b020db915bf3ea25e1fb75b1a984f59b01b7..bbb841c22de1d328b398456c9e20a83f6ac021ba 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=layout
 
index 529b8e08449abc7d937de8154490fd88d209d2b9..21dcf3486f330d9d05cd293fa5a7dda036b6d3fd 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=listtest
 
index a1f94adf84dbcce74ff674003ff36fc9af2372ee..fc59709fe3feabd06d2a8fa0f234f9fa5d8b3007 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=mdi
 
index 190001d338c73588382d0ebae8a833bd30fcb3ae..ba9930981add7cea9a3710a9741b091ef07d6787 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\wx
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=memcheck
 
index 2bc53604dd95dc62d0488886c999459767086b83..24926e06eae5c84955149f2fa11f30df496462f4 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=nativdlg
 
diff --git a/samples/oleauto/makefile.b32 b/samples/oleauto/makefile.b32
new file mode 100644 (file)
index 0000000..b34dea7
--- /dev/null
@@ -0,0 +1,64 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds oleauto example
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makeb32.env
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx32.lib
+LIBS=$(WXLIB) cw32 import32 ole2w32
+
+TARGET=oleauto
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = oleauto.obj
+
+$(TARGET).exe: $(OBJECTS) $(TARGET).res
+  tlink32 $(LINKFLAGS) @&&!
+c0w32.obj $(OBJECTS)
+$(TARGET)
+nul
+$(LIBS)
+$(TARGET).def
+$(TARGET).res
+!
+
+.$(SRCSUFF).obj:
+       bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+       bcc32 $(CPPFLAGS) -P- -c {$< }
+
+oleauto.obj:      oleauto.$(SRCSUFF)
+
+$(TARGET).res :      $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
+    brc32 -r /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+
diff --git a/samples/oleauto/makefile.g95 b/samples/oleauto/makefile.g95
new file mode 100644 (file)
index 0000000..9df4654
--- /dev/null
@@ -0,0 +1,37 @@
+#
+# File:                makefile.unx
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:   (c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile for oleauto example (UNIX).
+
+WXDIR = ../..
+
+# All common UNIX compiler flags and options are now in
+# this central makefile.
+include $(WXDIR)/src/makeg95.env
+
+OBJECTS = $(OBJDIR)/oleauto.$(OBJSUFF) $(OBJDIR)/oleauto_resources.$(OBJSUFF)
+
+all:    $(OBJDIR) oleauto$(GUISUFFIX)$(EXESUFF)
+
+wx:
+
+$(OBJDIR):
+       mkdir $(OBJDIR)
+
+oleauto$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
+       $(CC) $(LDFLAGS) -o oleauto$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
+
+$(OBJDIR)/oleauto.$(OBJSUFF):  oleauto.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ oleauto.$(SRCSUFF)
+
+$(OBJDIR)/oleauto_resources.o:  oleauto.rc
+       $(RESCOMP) -i oleauto.rc -o $(OBJDIR)/oleauto_resources.o $(RESFLAGS)
+
+clean:
+       rm -f $(OBJECTS) oleauto$(GUISUFFIX).exe core *.rsc *.res
diff --git a/samples/oleauto/makefile.nt b/samples/oleauto/makefile.nt
new file mode 100644 (file)
index 0000000..2042259
--- /dev/null
@@ -0,0 +1,64 @@
+#
+# File:                makefile.nt
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:   (c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds oleauto example (MS VC++).
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+WXUSINGDLL=0
+
+!include $(WXDIR)\src\ntwxwin.mak
+
+THISDIR = $(WXDIR)\samples\oleauto
+PROGRAM=oleauto
+
+OBJECTS = $(PROGRAM).obj
+
+$(PROGRAM):    $(PROGRAM).exe
+
+all:    wx $(PROGRAM).exe
+
+wx:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.nt FINAL=$(FINAL)
+        cd $(THISDIR)
+
+wxclean:
+        cd $(WXDIR)\src\msw
+        nmake -f makefile.nt clean
+        cd $(THISDIR)
+
+$(PROGRAM).exe:      $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(PROGRAM).res
+       $(link) @<<
+-out:$(PROGRAM).exe
+$(LINKFLAGS)
+$(DUMMYOBJ) $(OBJECTS) $(PROGRAM).res
+$(LIBS)
+<<
+
+
+$(PROGRAM).obj:      $(PROGRAM).$(SRCSUFF) $(DUMMYOBJ)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
+$(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
+    $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
+
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.sbr
+        -erase *.pdb
diff --git a/samples/oleauto/mondrian.ico b/samples/oleauto/mondrian.ico
new file mode 100644 (file)
index 0000000..2310c5d
Binary files /dev/null and b/samples/oleauto/mondrian.ico differ
diff --git a/samples/oleauto/mondrian.xpm b/samples/oleauto/mondrian.xpm
new file mode 100644 (file)
index 0000000..409f27a
--- /dev/null
@@ -0,0 +1,44 @@
+/* XPM */
+static char *mondrian_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 6 1",
+"  c Black",
+". c Blue",
+"X c #00bf00",
+"o c Red",
+"O c Yellow",
+"+ c Gray100",
+/* pixels */
+"                                ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+" oooooo +++++++++++++++++++++++ ",
+"                                ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++ .... ",
+" ++++++ ++++++++++++++++++      ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++ ++++++++++++++++++ ++++ ",
+" ++++++                    ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+" ++++++ OOOOOOOOOOOO XXXXX ++++ ",
+"                                "
+};
diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
new file mode 100644 (file)
index 0000000..05e9da1
--- /dev/null
@@ -0,0 +1,220 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        oleauto.cpp
+// Purpose:     OLE Automation wxWindows sample
+// Author:      Julian Smart
+// Modified by:
+// Created:     08/12/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+#ifdef __GNUG__
+    #pragma implementation "oleauto.cpp"
+    #pragma interface "oleauto.cpp"
+#endif
+
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+// for all others, include the necessary headers (this file is usually all you
+// need because it includes almost all "standard" wxWindows headers
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif
+
+#include <wx/msw/ole/automtn.h>
+
+#ifndef __WXMSW__
+#error "Sorry, this sample works under Windows only."
+#endif
+
+// ----------------------------------------------------------------------------
+// ressources
+// ----------------------------------------------------------------------------
+// the application icon
+#if defined(__WXGTK__) || defined(__WXMOTIF__)
+    #include "mondrian.xpm"
+#endif
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+// Define a new application type, each program should derive a class from wxApp
+class MyApp : public wxApp
+{
+public:
+    // override base class virtuals
+    // ----------------------------
+
+    // this one is called on application startup and is a good place for the app
+    // initialization (doing it here and not in the ctor allows to have an error
+    // return: if OnInit() returns false, the application terminates)
+    virtual bool OnInit();
+};
+
+// Define a new frame type: this is going to be our main frame
+class MyFrame : public wxFrame
+{
+public:
+    // ctor(s)
+    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+
+    // event handlers (these functions should _not_ be virtual)
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnTest(wxCommandEvent& event);
+
+private:
+    // any class wishing to process wxWindows events must use this macro
+    DECLARE_EVENT_TABLE()
+};
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// IDs for the controls and the menu commands
+enum
+{
+    // menu items
+    OleAuto_Quit = 1,
+    OleAuto_About,
+    OleAuto_Test,
+
+    // controls start here (the numbers are, of course, arbitrary)
+    OleAuto_Text = 1000,
+};
+
+// ----------------------------------------------------------------------------
+// event tables and other macros for wxWindows
+// ----------------------------------------------------------------------------
+
+// the event tables connect the wxWindows events with the functions (event
+// handlers) which process them. It can be also done at run-time, but for the
+// simple menu events like this the static method is much simpler.
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU(OleAuto_Quit,  MyFrame::OnQuit)
+    EVT_MENU(OleAuto_About, MyFrame::OnAbout)
+    EVT_MENU(OleAuto_Test, MyFrame::OnTest)
+END_EVENT_TABLE()
+
+// Create a new application object: this macro will allow wxWindows to create
+// the application object during program execution (it's better than using a
+// static object for many reasons) and also declares the accessor function
+// wxGetApp() which will return the reference of the right type (i.e. MyApp and
+// not wxApp)
+IMPLEMENT_APP(MyApp)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// the application class
+// ----------------------------------------------------------------------------
+
+// `Main program' equivalent: the program execution "starts" here
+bool MyApp::OnInit()
+{
+    // Create the main application window
+    MyFrame *frame = new MyFrame("OleAuto wxWindows App",
+                                 wxPoint(50, 50), wxSize(450, 340));
+
+    // Show it and tell the application that it's our main window
+    // @@@ what does it do exactly, in fact? is it necessary here?
+    frame->Show(TRUE);
+    SetTopWindow(frame);
+
+    // success: wxApp::OnRun() will be called which will enter the main message
+    // loop and the application will run. If we returned FALSE here, the
+    // application would exit immediately.
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// main frame
+// ----------------------------------------------------------------------------
+
+// frame constructor
+MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
+       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+{
+    // set the frame icon
+    SetIcon(wxICON(mondrian));
+
+    // create a menu bar
+    wxMenu *menuFile = new wxMenu;
+
+    menuFile->Append(OleAuto_Test, "&Test Excel Automation...");
+    menuFile->Append(OleAuto_About, "&About...");
+    menuFile->AppendSeparator();
+    menuFile->Append(OleAuto_Quit, "E&xit");
+
+    // now append the freshly created menu to the menu bar...
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(menuFile, "&File");
+
+    // ... and attach this menu bar to the frame
+    SetMenuBar(menuBar);
+
+    // create a status bar just for fun (by default with 1 pane only)
+    CreateStatusBar(2);
+    SetStatusText("Welcome to wxWindows!");
+}
+
+
+// event handlers
+
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    // TRUE is to force the frame to close
+    Close(TRUE);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("This is an OLE Automation sample",
+                 "About OleAuto", wxOK | wxICON_INFORMATION, this);
+}
+
+/* Tests OLE automation by making the active Excel cell bold,
+ * and changing the text.
+ */
+void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
+{
+    wxMessageBox("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWindows automation test!' in bold.");
+
+       wxAutomationObject excelObject, rangeObject;
+       if (!excelObject.GetInstance("Excel.Application"))
+       {
+        if (!excelObject.CreateInstance("Excel.Application"))
+        {
+                   wxMessageBox("Could not create Excel object.");
+                   return;
+        }
+       }
+       if (!excelObject.PutProperty("ActiveCell.Value", "wxWindows automation test!"))
+       {
+               wxMessageBox("Could not set active cell value.");
+               return;
+       }
+       if (!excelObject.PutProperty("ActiveCell.Font.Bold", (bool) TRUE))
+       {
+               wxMessageBox("Could not put Bold property to active cell.");
+               return;
+       }
+}
+
diff --git a/samples/oleauto/oleauto.def b/samples/oleauto/oleauto.def
new file mode 100644 (file)
index 0000000..c722a64
--- /dev/null
@@ -0,0 +1,8 @@
+NAME         OleAuto
+DESCRIPTION  'OLE Automation wxWindows Sample'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     4048
+STACKSIZE    16000
diff --git a/samples/oleauto/oleauto.rc b/samples/oleauto/oleauto.rc
new file mode 100644 (file)
index 0000000..7655c62
--- /dev/null
@@ -0,0 +1,3 @@
+mondrian ICON "mondrian.ico"
+#include "wx/msw/wx.rc"
+
index ad4d7fffa877dd97f6c1d646d8599cc75bcae918..b763889b14c26ad272268189895138f35051e23b 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=ownerdrw
 
index a27c4e2da8d45d0d9187b7702c892bcf1f5b761f..de2e4ce0f26366697394f63651fa5078b1edcef3 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=printing
 
index 6780eb5ec3ea4a1709b74bbf19a4a25bf94942ef..62381479eb4f77015f449074e307f2d6d0188bdc 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=resource
 
index 886b39eddcd87750644c4f4f408d463c829ea39b..9835e6dbfb0f1742678c662d76876de5abf8edc8 100644 (file)
@@ -17,7 +17,7 @@ WXDIR = $(WXWIN)
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include\msw
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
 
index 9f32c974ba6f07c3022dcf122ec8d34ff333dbbc..cb2d9a262a90d44fad4d601552e05624b37d35ba 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=test
 
index 0dddc9cdf832e0b7c31fda0457a2bdf870324205..618f2c309273892e0c9faf2904c494e9bba0c90b 100644 (file)
@@ -16,7 +16,7 @@ WXDIR = $(WXWIN)
 
 WXLIBDIR = $(WXDIR)\lib
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=treetest
 
index ebadbaf433aa072c144271456939d115e96038df..c12fa781e2ba6df1bf15f2c9c282a1f16c7edcef 100644 (file)
@@ -19,7 +19,7 @@ WXINC = $(WXDIR)\include\msw
 WXBASESRC = $(WXDIR)\src\base
 WXBASEINC = $(WXDIR)\include\base
 WXLIB = $(WXLIBDIR)\wx32.lib
-LIBS=$(WXLIB) cw32 import32
+LIBS=$(WXLIB) cw32 import32 ole2w32
 
 TARGET=validate