fixed DoGetBestSize -- it returned too small bounding box

[wxWidgets.git] / src / xpm / info.c

diff --git a/src/xpm/info.c b/src/xpm/info.c
index 9bc41c89ebc6d4d8af28d1f2da73c2e3d56b8c14..bac2d4490b875de416283816176083b3301e49fb 100644 (file)
--- a/src/xpm/info.c
+++ b/src/xpm/info.c
@@ -37,9 +37,15 @@
 /*
  * Init returned data to free safely later on
  */
 /*
  * Init returned data to free safely later on
  */

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+void
+xpmInitXpmInfo(XpmInfo* info)
+#else

 void
 xpmInitXpmInfo(info)
     XpmInfo *info;
 void
 xpmInitXpmInfo(info)
     XpmInfo *info;

+#endif

 {
     if (info) {
        info->hints_cmt = NULL;
 {
     if (info) {
        info->hints_cmt = NULL;


@@ -53,9 +59,15 @@ xpmInitXpmInfo(info)
 /*
  * Free the XpmInfo data which have been allocated
  */
 /*
  * Free the XpmInfo data which have been allocated
  */

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+void
+XpmFreeXpmInfo(XpmInfo* info)
+#else

 void
 XpmFreeXpmInfo(info)
     XpmInfo *info;
 void
 XpmFreeXpmInfo(info)
     XpmInfo *info;

+#endif

 {
     if (info) {
        if (info->valuemask & XpmComments) {
 {
     if (info) {
        if (info->valuemask & XpmComments) {


@@ -84,10 +96,15 @@ XpmFreeXpmInfo(info)
 /*
  * Set the XpmInfo valuemask to retrieve required info
  */
 /*
  * Set the XpmInfo valuemask to retrieve required info
  */

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+void xpmSetInfoMask(XpmInfo* info, XpmAttributes* attributes)
+#else

 void
 xpmSetInfoMask(info, attributes)
     XpmInfo *info;
     XpmAttributes *attributes;
 void
 xpmSetInfoMask(info, attributes)
     XpmInfo *info;
     XpmAttributes *attributes;

+#endif

 {
     info->valuemask = 0;
     if (attributes->valuemask & XpmReturnInfos)
 {
     info->valuemask = 0;
     if (attributes->valuemask & XpmReturnInfos)


@@ -99,10 +116,16 @@ xpmSetInfoMask(info, attributes)
 /*
  * Fill in the XpmInfo with the XpmAttributes
  */
 /*
  * Fill in the XpmInfo with the XpmAttributes
  */

+#ifdef __OS2__
+/* Visual Age cannot deal with old, non-ansi, code */
+void
+xpmSetInfo(XpmInfo* info, XpmAttributes* attributes)
+#else

 void
 xpmSetInfo(info, attributes)
     XpmInfo *info;
     XpmAttributes *attributes;
 void
 xpmSetInfo(info, attributes)
     XpmInfo *info;
     XpmAttributes *attributes;

+#endif

 {
     info->valuemask = 0;
     if (attributes->valuemask & XpmInfos) {
 {
     info->valuemask = 0;
     if (attributes->valuemask & XpmInfos) {