A light-weight C++ object model framework Windows API Tool Kit
Revisão | 7913ba431dca89b99fb51e0823d2c0f6ef4b1f70 (tree) |
---|---|
Hora | 2012-10-12 05:43:09 |
Autor | Keith Marshall <keithmarshall@user...> |
Commiter | Keith Marshall |
Change package name from wtk/wtkplus to wtklite.
--HG--
rename : wtkplus.h => wtklite.h
@@ -1,3 +1,18 @@ | ||
1 | +2012-09-11 Keith Marshall <keithmarshall@users.sourceforge.net> | |
2 | + | |
3 | + Change package name from wtk/wtkplus to wtklite. | |
4 | + | |
5 | + * configure.ac (AC_INIT): Set package name field to wtklite. | |
6 | + | |
7 | + * wtkplus.h: Rename file as... | |
8 | + * wtklite.h: ...this. | |
9 | + | |
10 | + * Makefile.in: Change corresponding generated library name... | |
11 | + (libwtkplus.a): ...from this... | |
12 | + (libwtklite.a): ...to this. | |
13 | + | |
14 | + * all files: Update references accordingly. | |
15 | + | |
1 | 16 | 2012-09-05 Keith Marshall <keithmarshall@users.sourceforge.net> |
2 | 17 | |
3 | 18 | Licence wording enhancements. |
@@ -56,7 +56,7 @@ OBJEXT = @OBJEXT@ | ||
56 | 56 | AR = @AR@ |
57 | 57 | ARFLAGS = @ARFLAGS@ |
58 | 58 | |
59 | -all: libwtkplus.a | |
59 | +all: libwtklite.a | |
60 | 60 | |
61 | 61 | # Default target is a statically linkable object library, comprising |
62 | 62 | # the following object modules. |
@@ -65,7 +65,7 @@ LIBWTK_OBJECTS = wtkbase.$(OBJEXT) wtkmain.$(OBJEXT) wndproc.$(OBJEXT) \ | ||
65 | 65 | dlgproc.$(OBJEXT) wtkchild.$(OBJEXT) wtkexcept.$(OBJEXT) errtext.$(OBJEXT) \ |
66 | 66 | sashctrl.$(OBJEXT) hsashctl.$(OBJEXT) vsashctl.$(OBJEXT) strres.$(OBJEXT) |
67 | 67 | |
68 | -libwtkplus.a: $(LIBWTK_OBJECTS) | |
68 | +libwtklite.a: $(LIBWTK_OBJECTS) | |
69 | 69 | $(AR) $(ARFLAGS) $@ $^ |
70 | 70 | |
71 | 71 | # Compilation and dependency tracking... |
@@ -103,17 +103,17 @@ install: install-dirs install-headers install-libs | ||
103 | 103 | install-dirs: |
104 | 104 | $(MKDIR_P) ${includedir} ${libdir} |
105 | 105 | |
106 | -install-headers: wtkplus.h wtkexcept.h | |
106 | +install-headers: wtklite.h wtkexcept.h | |
107 | 107 | $(INSTALL_DATA) $^ ${includedir} |
108 | 108 | |
109 | -install-libs: libwtkplus.a | |
109 | +install-libs: libwtklite.a | |
110 | 110 | $(INSTALL_DATA) $^ ${libdir} |
111 | 111 | |
112 | 112 | # Distribution rules. |
113 | 113 | # |
114 | 114 | TARNAME = $(PACKAGE)-$(VERSION)-mingw32 |
115 | 115 | SRCDIST_FILES = ChangeLog configure configure.ac Makefile.in install-sh \ |
116 | - wtkplus.h wtkexcept.h wtkbase.cpp wtkmain.cpp wtkchild.cpp wndproc.cpp \ | |
116 | + wtklite.h wtkexcept.h wtkbase.cpp wtkmain.cpp wtkchild.cpp wndproc.cpp \ | |
117 | 117 | dlgproc.cpp sashctrl.cpp wtkexcept.cpp errtext.cpp strres.cpp |
118 | 118 | |
119 | 119 | dist: srcdist devdist |
@@ -1,6 +1,6 @@ | ||
1 | 1 | # configure.ac |
2 | 2 | # |
3 | - AC_INIT([wtk],[0.1.0],[http://mingw.org/Reporting_Bugs]) | |
3 | + AC_INIT([wtklite],[0.1.0],[http://mingw.org/Reporting_Bugs]) | |
4 | 4 | # |
5 | 5 | # Implementation of a minimal C++ class framework for use with the |
6 | 6 | # Microsoft Windows Application Programming Interface. |
@@ -40,7 +40,7 @@ | ||
40 | 40 | */ |
41 | 41 | #define WIN32_LEAN_AND_MEAN |
42 | 42 | |
43 | -#include "wtkplus.h" | |
43 | +#include "wtklite.h" | |
44 | 44 | |
45 | 45 | namespace WTK |
46 | 46 | { |
@@ -49,7 +49,7 @@ | ||
49 | 49 | */ |
50 | 50 | #define WIN32_LEAN_AND_MEAN |
51 | 51 | |
52 | -#include "wtkplus.h" | |
52 | +#include "wtklite.h" | |
53 | 53 | |
54 | 54 | /* Identify the class implementation to be compiled; each of |
55 | 55 | * the HSASH_IMPLEMENTATION and VSASH_IMPLEMENTATION must be |
@@ -40,7 +40,7 @@ | ||
40 | 40 | */ |
41 | 41 | #define WIN32_LEAN_AND_MEAN |
42 | 42 | |
43 | -#include "wtkplus.h" | |
43 | +#include "wtklite.h" | |
44 | 44 | #include <string.h> |
45 | 45 | #include <stdio.h> |
46 | 46 |
@@ -40,7 +40,7 @@ | ||
40 | 40 | */ |
41 | 41 | #define WIN32_LEAN_AND_MEAN |
42 | 42 | |
43 | -#include "wtkplus.h" | |
43 | +#include "wtklite.h" | |
44 | 44 | |
45 | 45 | namespace WTK |
46 | 46 | { |
@@ -40,7 +40,7 @@ | ||
40 | 40 | */ |
41 | 41 | #define WIN32_LEAN_AND_MEAN |
42 | 42 | |
43 | -#include "wtkplus.h" | |
43 | +#include "wtklite.h" | |
44 | 44 | |
45 | 45 | namespace WTK |
46 | 46 | { |
@@ -41,7 +41,7 @@ | ||
41 | 41 | #define WIN32_LEAN_AND_MEAN |
42 | 42 | |
43 | 43 | #include <stdio.h> |
44 | -#include "wtkplus.h" | |
44 | +#include "wtklite.h" | |
45 | 45 | |
46 | 46 | namespace WTK |
47 | 47 | { |
@@ -10,7 +10,7 @@ | ||
10 | 10 | * $Id$ |
11 | 11 | * |
12 | 12 | * This header file declares the exception class WTK::runtime_error. |
13 | - * It is implicitly included when including wtkplus.h, but may also be | |
13 | + * It is implicitly included when including wtklite.h, but may also be | |
14 | 14 | * explicitly included by any application which wishes to use the WTK |
15 | 15 | * exception class, without the rest of the WTK C++ class framework. |
16 | 16 | * |
@@ -46,6 +46,13 @@ | ||
46 | 46 | */ |
47 | 47 | #define WTKEXCEPT_H 1 |
48 | 48 | |
49 | +/* This header file is primarily intended to be used only for C++. However, | |
50 | + * configure scripts may try to compile it as C, when checking availability; | |
51 | + * thus, we ignore C++ specific content when compiling as C, to ensure that | |
52 | + * configure doesn't choke in such cases. | |
53 | + */ | |
54 | +#ifdef __cplusplus | |
55 | + | |
49 | 56 | #include <exception> |
50 | 57 | |
51 | 58 | namespace WTK |
@@ -81,4 +88,5 @@ namespace WTK | ||
81 | 88 | }; |
82 | 89 | } |
83 | 90 | |
91 | +#endif /* __cplusplus */ | |
84 | 92 | #endif /* ! WTKEXCEPT_H: $RCSfile$: end of file */ |
@@ -1,6 +1,6 @@ | ||
1 | -#ifndef WTKPLUS_H | |
1 | +#ifndef WTKLITE_H | |
2 | 2 | /* |
3 | - * wtkplus.h | |
3 | + * wtklite.h | |
4 | 4 | * |
5 | 5 | * --------------------------------------------------------------------------- |
6 | 6 | * |
@@ -39,12 +39,19 @@ | ||
39 | 39 | * --------------------------------------------------------------------------- |
40 | 40 | * |
41 | 41 | */ |
42 | -#define WTKPLUS_H 1 | |
42 | +#define WTKLITE_H 1 | |
43 | 43 | |
44 | 44 | #include <stdlib.h> |
45 | 45 | #include <windows.h> |
46 | 46 | #include "wtkexcept.h" |
47 | 47 | |
48 | +/* This header file is primarily intended to be used only for C++. However, | |
49 | + * configure scripts may try to compile it as C, when checking availability; | |
50 | + * thus, we ignore C++ specific content when compiling as C, to ensure that | |
51 | + * configure doesn't choke in such cases. | |
52 | + */ | |
53 | +#ifdef __cplusplus | |
54 | + | |
48 | 55 | namespace WTK |
49 | 56 | { |
50 | 57 | class StringResource |
@@ -297,4 +304,5 @@ namespace WTK | ||
297 | 304 | }; |
298 | 305 | } |
299 | 306 | |
300 | -#endif /* ! WTKPLUS_H: $RCSfile$: end of file */ | |
307 | +#endif /* __cplusplus */ | |
308 | +#endif /* ! WTKLITE_H: $RCSfile$: end of file */ |
@@ -40,7 +40,7 @@ | ||
40 | 40 | */ |
41 | 41 | #define WIN32_LEAN_AND_MEAN |
42 | 42 | |
43 | -#include "wtkplus.h" | |
43 | +#include "wtklite.h" | |
44 | 44 | |
45 | 45 | namespace WTK |
46 | 46 | { |