From 809e8e443f2e863cf299d631c977648a7c5ff662 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 2 Jul 2001 10:06:51 +0000 Subject: [PATCH] Fix to minimal sample project file; changed protected -> public in wxGIFDecoder git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/microwin.rsp | 39 ++++++++++++++++++++++++++++------- include/wx/gifdecod.h | 2 +- samples/minimal/MinimalVC.dsp | 4 ++-- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/distrib/msw/microwin.rsp b/distrib/msw/microwin.rsp index 3603b64159..84cbab9eab 100644 --- a/distrib/msw/microwin.rsp +++ b/distrib/msw/microwin.rsp @@ -1,10 +1,16 @@ include/wx/*.h include/wx/*.cpp include/wx/*.inl -include/wx/microwin/*.h +include/wx/msw/*.h +include/wx/msw/*.rc +include/wx/msw/*.cur +include/wx/msw/*.ico +include/wx/msw/*.bmp +include/wx/msw/ole/*.h include/wx/generic/*.h include/wx/generic/*.xpm include/wx/unix/*.h +include/wx/univ/*.h src/common/*.cpp src/common/*.c @@ -13,14 +19,28 @@ src/generic/*.cpp src/generic/*.c src/unix/*.cpp src/unix/*.c -src/microwin/*.cpp -src/microwin/*.c -src/microwin/Makefile +src/univ/*.cpp +src/univ/*.c +src/univ/*.lst +src/univ/themes/*.cpp -samples/mw-minimal/*.cpp -samples/mw-minimal/*.h -samples/mw-minimal/Makefile -samples/mw-minimal/*.xpm +src/msw/*.cpp +src/msw/*.h +src/msw/*.lst +src/msw/*.def +src/msw/*.inc +src/msw/winestub.c +src/msw/gsocket.c +src/msw/gsockmsw.c +src/msw/version.rc +src/msw/makefile.mic +src/msw/ole/*.cpp + +samples/minimal/*.cpp +samples/minimal/*.h +samples/minimal/makefile.mic +samples/minimal/*.xpm +samples/minimal/*.ico lib/dummy.txt @@ -30,3 +50,6 @@ distrib/msw/tarmicrowin.sh microwindows.patches docs/microwin/readme.txt +docs/msw/readme.txt +docs/msw/install.txt + diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index 769169fd4c..576a25d962 100644 --- a/include/wx/gifdecod.h +++ b/include/wx/gifdecod.h @@ -108,7 +108,7 @@ private: int getcode(int bits, int abfin); int dgif(GIFImage *img, int interl, int bits); -protected: +public: // get data of current frame int GetFrameIndex() const; unsigned char* GetData() const; diff --git a/samples/minimal/MinimalVC.dsp b/samples/minimal/MinimalVC.dsp index 5c3106d9fb..328fb77360 100644 --- a/samples/minimal/MinimalVC.dsp +++ b/samples/minimal/MinimalVC.dsp @@ -143,8 +143,8 @@ LINK32=link.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "MinimalVC___Win32_UnivRelease" -# PROP BASE Intermediate_Dir "MinimalVC___Win32_UnivRelease" +# PROP BASE Output_Dir "UnivRelease" +# PROP BASE Intermediate_Dir "UnivRelease" # PROP BASE Ignore_Export_Lib 0 # PROP BASE Target_Dir "" # PROP Use_MFC 0 -- 2.45.2