Mercurial > hg > xemacs-beta
annotate lisp/x-scrollbar.el @ 4874:4c3f5e1ecbeb
ChangeLog for previous patch: regenerate intl-auto-encap-win32.c
(fix build problems when building --with-msw=no on Cygwin)
-------------------- ChangeLog entries follow: --------------------
lib-src/ChangeLog addition:
2010-01-15 Ben Wing <ben@xemacs.org>
* make-mswin-unicode.pl:
Various fixes to get this to work when using the Cygwin header files
in /usr/include/w32api instead of the VC++ ones:
-- Use /usr/include/w32api as default; don't assume that a passed-in
directory always ends in .../include.
-- Add `const' to list of known type modifiers.
-- If function already seen, warn but don't generate twice.
-- Eliminate `extern' from return type modifiers.
-- Cosmetic: When eliminating APIENTRY, also eliminate following
whitespace.
src/ChangeLog addition:
2010-01-15 Ben Wing <ben@xemacs.org>
* intl-auto-encap-win32.c:
* intl-auto-encap-win32.c (qxeExtractAssociatedIcon):
* intl-auto-encap-win32.c (qxeShellExecuteEx):
* intl-auto-encap-win32.c (qxeSHFileOperation):
* intl-auto-encap-win32.c (qxeSHQueryRecycleBin):
* intl-auto-encap-win32.c (qxeSHEmptyRecycleBin):
* intl-auto-encap-win32.c (qxeWNetAddConnection):
* intl-auto-encap-win32.c (qxeWNetAddConnection2):
* intl-auto-encap-win32.c (qxeWNetAddConnection3):
* intl-auto-encap-win32.c (qxeWNetCancelConnection):
* intl-auto-encap-win32.c (qxeWNetCancelConnection2):
* intl-auto-encap-win32.c (qxeWNetGetConnection):
* intl-auto-encap-win32.c (qxeWNetUseConnection):
* intl-auto-encap-win32.c (qxeWNetConnectionDialog1):
* intl-auto-encap-win32.c (qxeWNetDisconnectDialog1):
* intl-auto-encap-win32.c (qxeWNetOpenEnum):
* intl-auto-encap-win32.c (qxeWNetEnumResource):
* intl-auto-encap-win32.c (qxeWNetGetUniversalName):
* intl-auto-encap-win32.c (qxeWNetGetUser):
* intl-auto-encap-win32.c (qxeWNetGetProviderName):
* intl-auto-encap-win32.c (qxeWNetGetNetworkInformation):
* intl-auto-encap-win32.c (qxeWNetGetLastError):
* intl-auto-encap-win32.c (qxeMultinetGetConnectionPerformance):
* intl-auto-encap-win32.c (qxeAppendMenu):
* intl-auto-encap-win32.c (qxeCopyAcceleratorTable):
* intl-auto-encap-win32.c (qxeDlgDirSelectComboBoxEx):
* intl-auto-encap-win32.c (qxeEnumDesktops):
* intl-auto-encap-win32.c (qxeEnumWindowStations):
* intl-auto-encap-win32.c (qxeGetClassInfo):
* intl-auto-encap-win32.c (qxeGetClassLong):
* intl-auto-encap-win32.c (qxeGetClassName):
* intl-auto-encap-win32.c (qxeGetKeyboardLayoutName):
* intl-auto-encap-win32.c (qxeGetWindowLong):
* intl-auto-encap-win32.c (qxeGetUserObjectInformation):
* intl-auto-encap-win32.c (qxeGetWindowTextLength):
* intl-auto-encap-win32.c (qxeGrayString):
* intl-auto-encap-win32.c (qxeInsertMenu):
* intl-auto-encap-win32.c (qxeSetProp):
* intl-auto-encap-win32.c (qxeEnumICMProfiles):
* intl-auto-encap-win32.c (qxeExtTextOut):
* intl-auto-encap-win32.c (qxeSetICMProfile):
* intl-auto-encap-win32.c (qxeTextOut):
* intl-auto-encap-win32.c (qxeSHGetPathFromIDList):
* intl-auto-encap-win32.c (qxeFindText):
* intl-auto-encap-win32.c (qxeReplaceText):
* intl-auto-encap-win32.c (qxeImmInstallIME):
* intl-auto-encap-win32.c (qxeImmGetDescription):
* intl-auto-encap-win32.c (qxeImmGetIMEFileName):
* intl-auto-encap-win32.c (qxeImmGetCompositionString):
* intl-auto-encap-win32.c (qxeImmGetCandidateListCount):
* intl-auto-encap-win32.c (qxeImmGetCandidateList):
* intl-auto-encap-win32.c (qxeImmGetGuideLine):
* intl-auto-encap-win32.c (qxeImmConfigureIME):
* intl-auto-encap-win32.c (qxeImmEscape):
* intl-auto-encap-win32.c (qxeImmGetConversionList):
* intl-auto-encap-win32.c (qxeImmRegisterWord):
* intl-auto-encap-win32.c (qxeImmUnregisterWord):
* intl-auto-encap-win32.c (qxeImmEnumRegisterWord):
* intl-auto-encap-win32.c (qxesndPlaySound):
* intl-auto-encap-win32.c (qxePlaySound):
* intl-auto-encap-win32.c (qxewaveOutGetErrorText):
* intl-auto-encap-win32.c (qxewaveInGetErrorText):
* intl-auto-encap-win32.c (qxemidiOutGetErrorText):
* intl-auto-encap-win32.c (qxemidiInGetErrorText):
* intl-auto-encap-win32.c (qxemmioStringToFOURCC):
* intl-auto-encap-win32.c (qxemmioInstallIOProc):
* intl-auto-encap-win32.c (qxemmioOpen):
* intl-auto-encap-win32.c (qxemmioRename):
* intl-auto-encap-win32.c (qxemciSendCommand):
* intl-auto-encap-win32.c (qxemciSendString):
* intl-auto-encap-win32.c (qxemciGetDeviceID):
* intl-auto-encap-win32.c (qxemciGetErrorString):
* intl-auto-encap-win32.h:
* intl-auto-encap-win32.h (qxemciGetErrorString):
Regenerate these files from Cygwin headers.
* intl-encap-win32.c:
Bracket more functions in HAVE_MS_WINDOWS, to fix build problems
when building --with-msw=no on Cygwin.
Fixes for Cygwin headers:
-- Comment out IME.H, non-existent in Cygwin.
-- Make MessageBoxIndirect a `no' (don't encapsulate but generate
error if used) because it has a structure parameter that needs
to be A/W split but is declared as FOO*, and our parser can't
split this.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 15 Jan 2010 05:12:07 -0600 |
| parents | 7039e6323819 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 ;;; x-scrollbar.el --- scrollbar resourcing and such. |
| 2 | |
| 3 ;; Copyright (C) 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Sun Microsystems. | |
| 5 ;; Copyright (C) 1995, 1996 Ben Wing. | |
| 6 | |
| 7 ;; Author: Ben Wing <ben@xemacs.org> | |
| 8 ;; Maintainer: XEmacs Development Team | |
| 9 ;; Keywords: extensions, dumped | |
| 10 | |
| 11 ;; This file is part of XEmacs. | |
| 12 | |
| 13 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 14 ;; under the terms of the GNU General Public License as published by | |
| 15 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 16 ;; any later version. | |
| 17 | |
| 18 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 19 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 21 ;; General Public License for more details. | |
| 22 | |
| 23 ;; You should have received a copy of the GNU General Public License | |
| 24 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 26 ;; Boston, MA 02111-1307, USA. | |
| 27 | |
| 28 ;;; Synched up with: Not synched. | |
| 29 | |
| 30 ;;; Commentary: | |
| 31 | |
| 32 ;; This file is dumped with XEmacs (when X and menubar support is compiled in). | |
| 33 | |
| 34 ;;; Code: | |
| 35 | |
| 502 | 36 (globally-declare-fboundp |
| 37 '(x-init-specifier-from-resources x-get-resource)) | |
| 38 | |
| 428 | 39 (defun x-init-scrollbar-from-resources (locale) |
| 40 (x-init-specifier-from-resources | |
| 41 (specifier-fallback scrollbar-width) 'natnum locale | |
| 42 '("scrollBarWidth" . "ScrollBarWidth") | |
| 43 ;; The name strings are wrong, but the scrollbar name is | |
| 44 ;; non-deterministic so it is a poor way to set a resource | |
| 45 ;; for the scrollbar anyhow. | |
| 46 (cond ((featurep 'athena-scrollbars) | |
| 47 '("scrollbar.thickness" . "ScrollBar.Thickness")) | |
| 48 ((featurep 'lucid-scrollbars) | |
| 49 '("scrollbar.width" . "XlwScrollBar.Width")) | |
| 50 ((featurep 'motif-scrollbars) | |
| 51 '("scrollbar.width" . "XmScrollBar.Width")))) | |
| 52 ;; Athena scrollbars accept either 'thickness' or 'width'. | |
| 53 ;; If any of the previous resources succeeded, the following | |
| 54 ;; call does nothing; so there's no harm in doing it all the | |
| 55 ;; time. | |
| 56 (if (featurep 'athena-scrollbars) | |
| 57 (x-init-specifier-from-resources | |
| 58 (specifier-fallback scrollbar-width) 'natnum locale | |
| 59 '("scrollbar.width" . "ScrollBar.Width"))) | |
| 60 | |
| 61 ;; lather, rinse, repeat. | |
| 62 (x-init-specifier-from-resources | |
| 63 (specifier-fallback scrollbar-height) 'natnum locale | |
| 64 '("scrollBarHeight" . "ScrollBarHeight") | |
| 65 ;; The name strings are wrong, but the scrollbar name is | |
| 66 ;; non-deterministic so it is a poor way to set a resource | |
| 67 ;; for the scrollbar anyhow. | |
| 68 (cond ((featurep 'athena-scrollbars) | |
| 69 '("scrollbar.thickness" . "ScrollBar.Thickness")) | |
| 70 ((featurep 'lucid-scrollbars) | |
| 71 '("scrollbar.height" . "XlwScrollBar.Height")) | |
| 72 ((featurep 'motif-scrollbars) | |
| 73 '("scrollbar.height" . "XmScrollBar.Height")))) | |
| 74 ;; Athena scrollbars accept either 'thickness' or 'height'. | |
| 75 ;; If any of the previous resources succeeded, the following | |
| 76 ;; call does nothing; so there's no harm in doing it all the | |
| 77 ;; time. | |
| 78 (if (featurep 'athena-scrollbars) | |
| 79 (x-init-specifier-from-resources | |
| 80 (specifier-fallback scrollbar-height) 'natnum locale | |
| 81 '("scrollbar.height" . "ScrollBar.Height"))) | |
| 82 | |
| 83 ;; Now do ScrollBarPlacement.scrollBarPlacement | |
| 84 (let ((case-fold-search t) | |
| 85 (resval (x-get-resource "ScrollBarPlacement" "scrollBarPlacement" | |
| 442 | 86 'string locale nil 'warn))) |
| 428 | 87 (cond |
| 88 ((null resval)) | |
| 89 ((string-match "^top[_-]left$" resval) | |
| 90 (set-specifier scrollbar-on-top-p t locale) | |
| 91 (set-specifier scrollbar-on-left-p t locale)) | |
| 92 ((string-match "^top[_-]right$" resval) | |
| 93 (set-specifier scrollbar-on-top-p t locale) | |
| 94 (set-specifier scrollbar-on-left-p nil locale)) | |
| 95 ((string-match "^bottom[_-]left$" resval) | |
| 96 (set-specifier scrollbar-on-top-p nil locale) | |
| 97 (set-specifier scrollbar-on-left-p t locale)) | |
| 98 ((string-match "^bottom[_-]right$" resval) | |
| 99 (set-specifier scrollbar-on-top-p nil locale) | |
| 100 (set-specifier scrollbar-on-left-p nil locale)) | |
| 101 (t | |
| 102 (display-warning 'resource | |
| 103 (format "Illegal value '%s' for scrollBarPlacement resource" resval))))) | |
| 104 | |
| 105 ) | |
| 106 | |
| 107 ;;; x-scrollbar.el ends here |