diff options
| author | wiz <wiz@pkgsrc.org> | 2005-08-07 11:26:17 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-08-07 11:26:17 +0000 |
| commit | 287ae11f08b14c05ab833f34d7e03b6a7b1873e4 (patch) | |
| tree | b6b9f27c439486f11d1e0c8137bb66f7b6688053 /x11/wxGTK | |
| parent | c3f904e0b45ca49a5f42d89180a800810b11b5e6 (diff) | |
| download | pkgsrc-287ae11f08b14c05ab833f34d7e03b6a7b1873e4.tar.gz | |
Update wxGTK to 2.6.1.
2.6.1
-----
All:
- Added wxLaunchDefaultBrowser.
- Added wxPLURAL() macro in addition to _() (Jonas Rydberg)
All (GUI):
- Fixed potential infinite loop when adjusting wxScrolledWindow scrollbars.
- Radio in menus do not send menu event for selections of already selected item.
- Fixed wrong positioning of marks and enumerations in lists of wxHTML.
- wxImage::Rotate90 respects alpha channel.
- Added wxEVT_SCROLL_CHANGED as synonym for wxEVT_SCROLL_ENDSCROLL.
- Replaced artwork for some cursors, icons and toolbar buttons.
- Fixed sizing problem in generic wxCalendarCtrl for short day abbreviations.
- Fixed wxWindow::DoGetBestSize to keep original best size.
- PNM now supports ASCII and raw grey formats.
- wxGrid focus and edit key improvements.
wxMSW:
- Fixed erroneous selection of content in wxComboBox when within a wxStaticBox
(checking for selection caused by WM_STYLECHANGED).
- Added deferred positioning to wxRadioBox, wxSlider and wxSpinCtrl and thereby
eliminated some refresh glitches when resizing.
- Eliminated further refresh glitches caused by wxRadioBox (to nearby controls)
by refreshing parent when the radio box moves.
- Added ability set the system option "msw.staticbox.optimized-paint" to 0 to
allow a panel to paint graphics around controls within a static box.
- Refresh exposed areas when resizing, using WM_WINDOWPOSCHANGED.
- Worked around an apparent bug in deferred window positioning (moving a
window from (x, y) to (a, b) and back to (x, y) misses the last step) by
checking window positions against corresponding sizer state, if any.
- A control's text colour now reflects the system colour setting.
- Fixed wxFileName::GetLongPath() to behave correctly during the first call too.
- Fixed alpha blitting to take into account source position.
- Setting foreground colour for wxCheckBox now works when using XP themes too.
- wxStaticBox label can use custom foreground colour.
- Now uses newer font MS Shell Dlg 2 if possible.
- Compiles again with WIN64.
- Winelib compilation now works.
- When converting a wxIcon to a bitmap check if the icon has an alpha
channel and set the bitmap to use it.
- wxSlider now also sends wxEVT_SCROLL_CHANGED when using mouse wheel
- Miscellaneous wxMediaCtrl improvements.
- wxTopLevelWindow::ShowFullScreen logic error fixed.
- Fixed wxScrollBar background colour bug.
- Fixed problems with paper sizes being ignored.
- wxNotebook refresh problem fixed.
- DDE fixed for Unicode.
- Fixed ownerdrawn multiline buttons.
- wxCheckListBox item background fixed.
- Fixed some wxRegKey bugs.
wxWinCE:
- Fixed wxFileName::CreateTempFileName.
wxGTK:
- Added support for wxSTAY_ON_TOP (GTK 2.4+).
- Fixed wxTextCtrl::SetStyle for overlapping calls.
- Fixed scrollbar border colour.
- Added bitmap support in menus.
wxMac:
- Added support for launching 'APPL' bundles with wxExecute (usually they have a
.app extension and are the ones that reside in the Applications folder).
- Fixed a bug in wxGetKeyState where shift and some other keys were returning an
incorrect state.
- Fixed toolbar colour bug on Tiger.
- Fixed visual problems caused by removal of About menu item.
- Window menu now added automatically.
- Configure fixed for wxBase compilation.
- Modified function key support fixed.
- wxTopLevelWindow::Maximize improvements.
wxX11:
- Menu problems fixed.
- wxScrolledWindow scrolls any child windows.
- Fixed a font memory leak.
- Multiple wxTimers now work correctly.
2.6.0
-----
All:
- wxPathExists deprecated, use wxDirExists instead.
- Configure: --enable-std_iostreams, --enable-std_string are now the default.
All (GUI):
- Fixed ~wxStatusBar and ~wxToolBar which tried to check
non-existent wxFrameBase RTTI, causing a crash if not in a frame.
wxMSW:
- Fixed static box border when the label is empty.
- Fixed SetBackgroundColour() to change only label background, not entire box.
- wxHelpController is now aliased to wxCHMHelpController.
wxWinCE:
- Fixed device origin setting and clipping region setting.
wxGTK:
- New configure syntax for specifying the GTK+ version.
--with-gtk Use GTK 2.x, no fallback
--with-gtk=1 Use GTK 1.2, no fallback
--with-gtk=2 Use GTK 2.x, no fallback
--with-gtk=any Use any available GTK
- wxMenuItem::SetText() takes care of hotkeys, too.
- Reworked text wrapping for wxStaticText.
wxMac:
- Implemented most of the wxFileType and wxMimeTypesManager functions
2.5.5
-----
All:
- wxURI::GetUser() only returns the user name now, use GetUserInfo() to get
user and password as in 2.5.4; wxURI::GetPassword() added.
- Added wxDebugReport class.
- Added wxTempFileOutputStream by Stas Sergeev.
- Fixed wxDateTime::SetToWeekDayInSameWeek(Sun, Monday_First).
- Added WXK_SPECIAL keycodes for special hardware buttons.
- Fixed bug with wxFile::Seek(-1, wxFromCurrent).
- Added wxString/C array constructors to wxArrayString.
- Added wxMemoryInputStream(wxMemoryOutputStream&) constructor (Stas Sergeev)
All (GUI):
- Added GetIcon, GetBitmap to wxImageList. wxGenericImageList's original
GetBitmap is renamed GetBitmapPtr.
- Added XPM data constructor to wxImage.
- Added style parameter to wxBufferedDC to allow buffering just the client, or
the whole virtual area.
- Restored ability to set a custom splitter sash size with SetSashSize.
- Fixed wxScrolledWindow sizer behaviour so that the virtual size
isn't used to set the window size.
- Added wxTE_BESTWRAP (based on patch by Mart Raudsepp).
- wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED is now only sent once at the end of
splitter dragging and not after each CHANGING event (Jacobo Vilella Vilahur).
- Added wxImage::IsTransparent().
Unix:
- Fixed build on Linux/AMD64.
wxMSW:
- Added "orient" parameter to wxMDIParentFrame::Tile().
- wxTextCtrl with wxTE_RICH2 style now uses RichEdit 4.1 if available.
- fix handling Alt-key events in wxComboBox (reported by Joakim Roubert).
- wxWindow::Refresh() refreshes the window children as well.
- Improved static box and radio box refresh and background colour
handling (Jamie Gadd).
wxGTK:
- Improved wxSystemSettings::GetMetric() to work better with X11 (Mart Raudsepp).
- Corrected wxListBox selection handling.
- Corrected default button size handling for different themes.
- Corrected splitter sash size and look for different themes.
- Fixed keyboard input for dead-keys.
- Added support for more wrapping styles (Mart Raudsepp).
- GTK2.4+ wxFileDialog reimplemented to support non-modal usage better,
and fix all known bugs (Mart Raudsepp).
wxMac:
- Added wxFRAME_EX_METAL, wxDIALOG_EX_METAL for metallic-look windows.
wxPalmOS:
- Native wxRadioBox implementation.
wxWinCE:
- Added wxNB_FLAT for flat-look notebooks on Windows CE.
- Titlebar OK button on PocketPC now sends command set by SetAffirmativeId.
You can also override wxDialog::DoOK if you need more flexibility.
- Dialog size now takes into account SIP or menubar.
- Panels more naturally white on PocketPC.
- wxDIALOG_EX_CONTEXTHELP ignored on WinCE since it interferes
with correct titlebar style.
- Frames have Ctrl+Q accelerator set automatically, as per the
PocketPC guidelines
- Documented issues in manual under wxWinCE topic.
- Made (Un)RegisterHotKey WinCE-aware.
- Sends wxEVT_HIBERNATE event.
- Now fakes wxEVT_ACTIVATE_APP to be symmetrical with wxEVT_HIBERNATE.
- Added wxTE_CAPITALIZE for CAPEDIT controls.
- wxDialog::GetToolBar can be used if you need to add buttons
to the dialog's toolbar.
2.5.4
-----
All:
- wxEvent and derived classes don't have public members any more, you must
use accessors methods now (Mart Raudsepp)
- new classes for reading and writing ZIP files (M.J.Wetherell)
- large files support for wxFFile (M.J.Wetherell)
- classes in the manual are now cross-referenced (Zbigniew Zagórski)
- Norwegian (Bokmål) translation added (Hans F. Nordhaug)
- wxDynamicLibrary::HasSymbol() added
- added wxEXEC_NODISABLE flag to be used with wxExecute(wxEXEC_SYNC)
- added wxTextInputStream::operator>>(wchar_t) for compilers which support this
- added wxURI, a class for dealing with Uniform Resource Identifiers
- changed wxURL to inherit from wxURI and provide assignment and comparison
- implemented wxConvUTF7 (modified patch from Fredrik Roubert)
- added versions of MB2WC and WC2MB for wxMBConv that works for embedded null chars
- Unicode support in wxODBC is now fully implemented
- A new data type specific to wxWidgets called SQL_C_WXCHAR has been introduced.
SQL_C_WXCHAR should be used rather than SQL_C_CHAR to ensure transparent
behavior between Unicode and non-unicode builds
- BLOB example added to samples/db (thanks to Casey O'Donnell)
- use wxStream::GetLength() instead of deprecated GetSize()
- wxGetOsDescription() is now more precise (Olly Betts)
- XRC supports system fonts and colours (Ray Gilbert)
- Added flags argument to wxKill/wxProcess::Kill to kill child processes.
- Added wxPrintFactory classes so that it is possible to add a new
print system backend at run-time. This was required by the new GNOME
printing stuff in the GTK port.
- Deprecated print setup dialog.
- Added support to the wxODBC classes for Firebird 1.5 database
- The samples/db sample program now includes an optional example of using a BLOB
datatype (if BLOB support is enabled and supported by the database)
- added wxDynamicLibrary::ListLoaded()
- wxGetPowerType() and wxGetBatteryState() addition
- wxSystemSettings::GetSystem*() members deprecated and replaced with
wxSystemSettings::Get*()
- wxWindowBase::DoGetBestSize now includes the difference (if any) between
the client size and total size of the window. Code that sets the
client size using the best size, or that added extra space to sizers
to compensate for this bug may need to be changed.
- Changed calculation of scrolling area to not clip away some bits
due to a rounding error.
- Changed GetVirtualSize() to return client size by default until
SetVirtualSize() gets called. From then on it will only return that.
- Various changes to how wxListCtrl and wxTreeCtrl react to right
mouse clicks and left mouse click for starting a drag operation.
- "Alt" key (VK_MENU) now results in WXK_ALT keyboard event, not WXK_MENU
- wxFFile::ReadAll() now takes an optional wxMBConv parameter
- wxCommandProcessor::MarkAsSaved() and IsDirty() added (Angela Wrobel)
- added wxStackWalker and related classes (Win32 and some Unix versions only)
All (GUI):
- added wxMediaCtrl
- added wxDatePickerCtrl
- wxHtmlWindow now supports background images given in <body> tag
- wxSplitterWindow now supports gravity parameter (Zbigniew Zagórski)
- recursive wxSizer::GetItem returns item of given window, sizer or nth index
- wxLayoutConstraints now use best size, not current size, for AsIs() condition
- wxSizer::Add/Insert etc. now returns pointer to wxSizerItem just added and this
item remembers its wxRect area (Brian A. Vanderburg II)
- wxBookCtrl renamed to wxBookCtrlBase, wxBookCtrl is reserved for most native
book control (for now wxChoicebook for MSSmartphone, wxNotebook for others).
Necessary event macros, types and styles mapped accordingly.
- new wxBrush::IsHatch() checking for brush type replaces IS_HATCH macro
- wxProgressDialog accepts smooth gauge again (wxPD_SMOOTH style)
- wxProgressDialog new style: wxPD_CAN_SKIP which provides skipping some parts
of the progress (with new "Skip" button in dialog)
- wxGenericListCtrl::SetItemState(-1) now changes the state of all items as
in wxMSW version (Gunnar Roth)
- added wxImage::InitAlpha()
Unix:
- wxPuts() now correctly outputs trailing new line in Unicode build
wxGTK:
- Added printing support by way of using libgnomeprint. The library
now checks at runtime, if the library is installed and will use it
if it is. Otherwise, it will fall back to the old PostScript printing
code, from which the Pango drawing code was removed.
- Implemented/improved wxDC::DrawRotatedText()
- fixed wxFileDialog::SetWildcard()
- native file dialog is now used if available (Zbigniew Zagorski)
- implemented wxTextCtrl::Freeze() and Thaw(). The GtkTextBuffer
is not a valid one during frozen state. Get a pointer to it right
after wxTextCtrl creation if you really need to. (Mart Raudsepp)
- Changed calls to GTK+ 2.4.x functions so that the code checks at
runtime, which library version is installed so that these functions
are only called with GTK+ 2.4.x installed and should yield linker
errors otherwise.
- wxTextCtrl text insertion efficiency fixed. (Mart Raudsepp)
- Added wxRawBitmap support
- Corrected Input method handler code (for Chinese etc.) and its
interaction with wxWidgets' events.
- wxTE_AUTO_URL implemention for wxGTK2 multiline wxTextCtrls (Mart Raudsepp)
wxMac:
- Vertical sliders oriented consistent with MSW/GTK (0 at top) (Kevin Hock)
- wxDynamicLibrary::GetDllExt() now returns ".bundle", not ".dylib"
- wxDynamicLibrary::GetSymbol() now prepends underscore to the symbol name
- wxJoystick now works on OSX
wxMSW:
- fixed enhanced metafiles loading from files (Andreas Goebel)
- wxRadioButtons no longer have to be consecutive in a group
- fixed spurious selection of combobox text during resize
- pass correct tool id (and not always -1) to EVT_TOOL_RCLICKED() handler
- added wxRegKey::Export(file)
wxWinCE:
- Added support for MS Handheld PC 2000. This was done before 2.5.4,
but not mentioned anywhere.
- Added (preliminary) support for sockets
wxUniv:
- wxBU_... button align flags support
- vertical notebook orientation support
- 3rd state support for checkboxes
- wxLB_SORT and wxCB_SORT now cause case-insensitive sorting
wxPalmOS:
- William Osborne has won and new port was born
(see: "wxPalmOS porting challenge")
- polishing of the port (unnecessary 2.4 API compatibility, removed
all wxMSW specific code which was base for the new port)
- enumeration of available volumes
- native wxPrefConfig around Preferences database
- native wxProgressDialog implementation
- native wxColourDialog implementation
- native wxSystemSettings colours
- native wxButton implementation
- native wxCheckBox implementation
- native wxSlider implementation
- native wxToggleButton implementation
- native wxRadioButton implementation
- native wxStaticText implementation
- native wxDatePickerCtrl implementation
2.5.3
-----
All:
- support for large (>2 Gb) files in wxFile (Tim Kosse)
- number of fixes to wxPluginManager (Rick Brice, Hans Van Leemputten)
- fixed memory leak in wxURL when using a proxy (Steven Van Ingelgem)
- fixed bug in wxDateTime::Set(jdn) when DST was in effect
- fixed fatal bug in wxString when wxUSE_STL==1 (Kurt Granroth)
- support msgids in charsets other than C and languages other than English
(based on patch by Stefan Kowski)
- added wxMicroSleep() and wxMilliSleep() replacing deprecated wxUsleep()
- basic UDP sockets support (Lenny Maiorani)
- fixed wxDateTime::GetWeekDayName() for some dates (Daniel Kaps)
- deprecated wxDateTime::SetToTheWeek() in favour of SetToWeekOfYear()
- active mode support in wxFTP (Randall Fox)
- sped up wxHTTP and wxFTP
- added wxStringInput/OutputStreams
- added wxFileConfig::Save(wxOutputStream)
- fixed wxString's behavior with inserted null characters
All (GUI):
- added wxWindow::MoveBefore/AfterInTabOrder() to change tab navigation order
- added wxTaskBarIcon::CreatePopupMenu which is now the recommended way
of showing a popup menu; calling wxTaskBarIcon::PopupMenu directly
is discouraged
- added ..._CMD_...(id) variants for wxGrid event table entry macros
- added wxWindow::Navigate for programmatic navigation to the next control
- wxTextCtrl::OnChar now inserts a tab character if wxTE_PROCESS_TAB is set
- added wxKeyEvent::GetUnicodeKey()
- added wxKeyEvent::CmdDown() and wxMouseEvent::CmdDown()
- implemented wxListCtrl::FindItem() for non-MSW (Robin Stoll)
- added status bar fields styles support (Tim Kosse)
- added convenience functions wxSizer::AddSpacer() and
wxSizer::AddStretchSpacer() (as well as Prepend and Insert variants)
- added samples/splash
- added support for stock buttons
- added wxTopLevelWindow::RequestUserAttention()
- support for comma in contrib gizmo wxLEDNumberCtrl (Grant Likely)
- recursive wxSizer::Show for subsizer and return value if element was found
- added wxChoicebook control
- smoother time estimation updates in wxProgressDialog (Christian Sturmlechner)
- the XRC contrib library was moved to the core
- wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection
- it is now possible to create a wxFont with given size in pixels (d2walter)
- added wxTopLevelWindow::IsActive()
- wxSystemSettings::GetMetric now returns -1 for metrics that are not
supported, instead of zero.
- IMPLEMENT_DYNAMIC_CLASS2 macro compilation fixed (Serge Bakkal)
Unix:
- wxTaskBarIcon now supports freedesktop.org System Tray protocol
- security fixes to wxSingleInstanceChecker
- wx-config script was modified to allow choosing from multiple installed
builds of wxWidgets and to return flags/libs for selected libraries only
- wx-config has new --version-full option
wxCocoa:
- added Unicode compatibility layer for OSX 10.2
- fixed so that wxCocoa runs in OSX 10.2
- Tooltips now supported
- wxSound now supported
- wxDisplay now supported
- Some stock cursors now supported
wxMac:
- fixed MLTE text control GetLineText and GetLineLength on OSX
- added OSX wxTaskBarIcon implementation for the OSX Dock
- added Unicode compatibility layer for OSX 10.2
- wxGetKeyState now works with nearly all wx key codes
wxGTK:
- wxGTK uses GTK+ 2.x by default now, you have to pass --disable-gtk2 to
configure if you want to use GTK+ 1.2
- fixed many rendering artifacts and wrong colours with lots of GTK+ themes
- implemented wxColourDialog as native dialog
- implemented wxTextCtrl::HitTest() (GTK+ >= 2)
- implemented wxTextCtrl::ScrollLines() and ScrollPages for GTK+ 2.x
- wxTreeCtrl::GetCount() counts root as well now (compatible with MSW)
- added support for wxCHK_3STATE style (GTK2 only)
- implemented text underlining under GTK2
- implemented wxFRAME_NO_TASKBAR style (GTK >= 2.2)
- implemented support for wxSYS_DCLICK_?, wxSYS_DRAG_? and wxSYS_CURSOR_?
in wxSystemSettings::GetMetric (Mart Raudsepp)
- implemented wxTopLevel::IsMaximized() for GTK+2 and WMs that implement
freedesktop.org's wm-spec (Mart Raudsepp)
- wxEVT_CONTEXT_MENU is now generated for right mouse press, not release
- implemented alpha channel support in wxBitmap
- added native GTK+2 wxArtProvider implementation with ability to load
icons from icon theme in addition to recognized stock art
- fixed crash on 64 bit platforms (Paul Cornett)
wxMotif:
- added support for wxCHK_3STATE style (3 state checkbox)
wxMSW:
- fixed UNC paths handling in wxFileSystem (Daniel Nash)
- set wxKeyEvent::m_uniChar in Unicode build
- support for alpha channel in toolbar bitmaps (Jurgen Doornik)
- wxFileDialog can now be moved and centered (Randall Fox)
- restored (and improved) possibility to use wx with MFC broken in 2.5.2
- fixed wxTextCtrl::SetMaxLength for rich edit controls
- fixed flat style for toolbars under XP, Windows Classic style
- fixed truncation of transferred data in wxConnection under unicode build
- wxChoice and wxComboBox dropdown background can be set now too (Adrian Lupei)
- fixed wxMaximizeEvent generation in wxFrame
- don't send duplicate EVT_COMBOBOX events whenever selection changes any more
- implemented support for selecting printer bin (Steven Van Ingelgem)
- fixed wxListCtrl::SetSingleStyle() which was broken since a few releases
- fixed print setup problem (always uses default printer) in Unicode build
wxUniv/X11:
- fixed fatal crash when opening a menu
wxWinCE:
- added native WinCE driven smartphone wxTextCtrl implementation using spinners
- added native WinCE driven smartphone wxChoice implementation using spinners
- added automated but customizable handling of native WinCE driven smartphone menus
- fixed wxRadioBox and wxStaticBox
wxHTML:
- added support for nested index entries and index entries pointing to more
than one page to wxHtmlHelpController
2.5.2
-----
All:
- Hindi translation added (Dhananjaya Sharma)
- Brazilian Portuguese translation added (E. A. Tacao)
- wxDynamicCast() now uses static_cast<wxObject *> internally and so using it
with anything not deriving from wxObject will fail at compile time (instead
of run-time) now
- when wxUSE_STL == 1 and STL provides quasi-standard hash_map/hash_set,
wxHashMap/wxHashSet are just typedefs for them. This makes impossible
to forward declare these classes.
All (GUI):
- wxHtmlWindow now delays image scaling until rendering,
resulting in much better display of scaled images
- Added UpdateSize to wxSplitterWindow to allow layout while hidden
- implemented Freeze/Thaw() for wxGenericTreeCtrl (Kevin Hock)
- support for KOI8-U encoding added (Yuriy Tkachenko)
- The old wxADJUST_MINSIZE behaviour is now the default behaviour for
sizer items that are windows. This means that GetAdjustedBestSize
will now be called by default to determine the minimum size that a
window in a sizer should have. If you want to still use the initial
size (and not the BestSize) then use the wxFIXED_MINSIZE flag. When
windows are added to a sizer their initial size is made the window's
min size using SetSizeHints, and calls to wxSizer::SetItemMinSize
are also forwarded to SetSizeHints for window items.
- added wxRegEx::GetMatchCount()
- it is now possible to display images in wxHtmlListBox
wxMSW:
- wxWindow::Freeze()/Thaw() can now be nested
- Added wxSP_NO_XP_THEME style to wxSplitterWindow to switch off
XP theming (some applications look bad without 3D borders)
- wxMenuBar::GetLabelTop() doesn't include '&'s in the label any more
- wxRegConf couldn't read global settings without admin privileges and didn't
even try to do it by default -- now it does
- wxTaskBarIcon must be explicitly destroyed now, otherwise the application
won't exit even though there are no top level windows
- wxFileName::GetModificationTime() works with opened files too now
- wxDC::GetClippingBox() now works even for clipping regions created by Windows
- fixed wxFileDataObject in Unicode build (Alex D)
- subindented paragraphs support (Tim Kosse)
wxGTK:
- added support for wxTE_RIGHT and wxTE_CENTRE styles under GTK2 (Mart Raudsepp)
wxMotif:
- removed wxMenuItem::DeleteSubMenu()
- wxButtons use Motif default size, which is smaller than it used to be
and closer to wxMSW/wxGTK look. This can be disabled by setting
motif.largebuttons system option to 1 (see wxSystemOptions).
wxUniv/X11:
- implemented DrawRoundedRectangle() (clawghoul)
wxHTML:
- improved tables and lists layout algorithms (Tim Kosse)
- <div> handling fix (Xavier Nodet)
Unix:
- fixed priorities of mailcap entries (David Hart)
- added "wx-config --libs=std,<extra>" syntax (i.e. support for "std")
wxODBC:
- Full Unicode support is now available
- BLOB support is working
2.5.1
-----
All:
- event table macros now do some minimal type safety checks (Michael Sögtrop)
- added wxGzipInput/OutputStream, bug fixes in wxZlibStreams (M.J.Wetherell)
- wxDateTime::ParseDateTime() implemented (Linus McCabe)
- wxHTTP::GetResponse() added (David Nock)
- added conversions to/from UTF 16/32 LE/BE (Andreas Pflug)
- added wxTextInputStream::ReadChar() (M.J.Wetherell)
- added translation to Afrikaans (Petri Jooste)
- Spanish translations updated (Javier San Jose)
- added gettext plural forms support to wxLocale (Michael N. Filippov)
- wxFileName::Normalize(wxPATH_NORM_ALL) doesn't lower filename case any more
- wxFileName::Normalize(wxPATH_NORM_ENV_VARS) now works
- check if file exists in wxFileConfig::DeleteFile() (Christian Sturmlechner)
- when wxUSE_STL == 1 wxHashTable will not be implemented using wxHashMap
(as in 2.5.0).
- added some extra convenience functions to wxRect such as
GetBottomRight (Hajo Kirchhoff)
- changed built-in regex library to a Unicode-compatible version based
on TCL sources (Ryan Norton, M. J. Wetherell)
- added extra convenience functions to wxPoint for adding a
wxSize (Wlodzimierz Skiba)
- intermediate wxIPaddress class added to prepare for
wxIPV6address (Ray Gilbert)
- added overloaded constructors and Create() methods taking wxArrayString
for wxChoice, wxComboBox, wxListBox, wxRadioBox, wxCheckListBox,
wxSingleChoiceDialog, wxMultipleChoiceDialog
- renamed wxWave class to wxSound
All (GUI):
- added 3-state checkboxes for MSW/Mac (Dimitri Schoolwerth)
- added some support for C++ exceptions in the library (do read the manual!)
- added wxListCtrl::GetViewRect()
- added wxTextCtrl::MarkDirty()
- wxToolBar::ToggleTool() now works for radio buttons (Dag Ågren)
- wxListCtrl now sends an END_LABEL event if editing was cancelled, too
- bug in wxRect ctor from two [out of order] wxPoints fixed (Steve Cornett)
- status text is now restored after wxMenu help is shown in it
- bug in wxWindow::RemoveEventHandler() fixed (Yingjun Zhang)
- make it possible to use wxRTTI macros with namespaces (Benjamin I. Williams)
- wxColourDatabase API now uses objects instead of pointers
- added resolution option to JPEG image handler (Jeff Burton)
- added wxCalendarEvent::SetDate, wxCalendarEvent::SetWeekDay
- wxGenericDirCtrl now accepts multiple wildcards
- added focus event forwarding to wxGrid (Peter Laufenberg)
- fixed scrollbar problem in wxGrid (not showing scrollbars
when sizing smaller) (Shane Harper)
- dbbrowse demo fixed for Unicode (Wlodzimierz Skiba)
- added wxStatusBar support to XRC (Brian Ravnsgaard Riis)
- wxMenu::Append and etc. return a pointer to the wxMenuItem that was
added or inserted, or NULL on failure.
- using a -1 (wxID_ANY) for menu or toolbar item IDs will now generate new id
- added option to generate C++ headers to wxrc utility (Eduardo Marques)
- added wxDC::DrawPolyPolygon() for MSW/PS (Carl-Friedrich Braun)
- wxBufferedDC now allows to preserve the background and is documented
- added wxDC::GetPartialTextExtents
wxMSW:
- wxWidgets now builds under Win64
- fixed DDE memory leaks
- fixed wxTE_*WRAP styles handling
- wxTextCtrl::GetValue() works with text in non default encoding
- changed wxCrashReport to generate minidumps instead of text files
- wxRadioButtons are now checked when they get focus (standard behaviour)
- several fixes to owner drawn menu items (Christian Sturmlechner)
- wxGauge now supports full 32 bit range (Miroslav Rajcic)
- make it possible to give focus to the notebook tabs (Hajo Kirchhoff)
- MDI child frames are not always resizeable any more (Andrei Fortuna)
- fixed enumerating of entries/groups under '/' in wxRegConfig
- added wxSYS_ICONTITLE_FONT (Andreas Pflug)
- added wxPATH_NORM_SHORTCUT to wxFileName
- wxComboBox::GetValue within a wxEVT_COMMAND_TEXT_UPDATED event
should now pass the correct value even if the handler for
wxEVT_COMMAND_COMBOBOX_SELECTED changed the selection
- wxFileDialog now returns correct filter index for multiple-file dialogs
- added wxTextCtrl::HitTest()
- experimental wxURL implementation using WinInet functions (Hajo Kirchhoff)
- fixed several bugs in wxNotebook with wxNB_MULTILINE style
- accelerators are now initially hidden if appropriate (Peter Nielsen)
- background colour of a wxComboBox may now be set
- fixed wxListCtrl::GetItemText/BackgroundColour()
- Esc can now be used to close menus in the dialogs (Hartmut Honisch)
- Added msw.remap system option so colourful toolbar buttons
aren't mangled if you set it to 0. The default is 1
- Toolbar buttons are now centred if the bitmap size is smaller
than the specified default size
- Fixed a bug in wxSpinCtrl::DoGetBestSize that would make wxSpinCtrl too tall
wxGTK:
- fixes to wxTextCtrl scrolling under GTK2 (Nerijus Baliunas)
- fix for crash when using user-dashed lines (Chris Borgolte)
- fixed wxChoice::Delete() in presence of client data
- allow calling wxWindow::SetFont if window not yet created
- use same average character width as other ports when calculating dialog units
- fixed mouse wheel handling under GTK2 (Hugh Fisher)
- wxNotebook::HitTest() implemented (Daniel Lundqvist)
- memory leaks fixes in wxFileDialog (John Labenski)
- don't drop click events from triple clicks (Frode Solheim)
wxMac:
- use same average character width as other ports when calculating dialog units
- implemented handling of mouse wheel
- fix for long file names (longer than 32 characters) in file dialogs
- use Unix sockets for Mach-o builds
wxMotif:
- look for Motif 2.1 headers before Motif 1.2 ones in configure
wxHTML:
- wxHtmlHelpController now supports compressed MS HTML Help files (*.chm)
on Unix (Markus Sinner)
Unix:
- added XFree86 resolution changing using xf86vidmode extensions (Ryan Norton)
- implemented asynchronous playback in wxSound and added SDL backend in
addition to existing OSS one
- it is now possible to send PostScript to any output stream (Zoltan Kovacs)
2.5.0
-----
All:
- It is now possible to build several smaller libraries instead of single
huge wxWidgets library; wxBase is now dependency of GUI ports rather then
separately compiled library
- added wxDateSpan::operator==() and !=() (Lukasz Michalski)
- added wxFileName::GetForbiddenChars() (Dimitri Schoolwerth)
- use true/false throughout the library instead of TRUE/FALSE
- wxStopWatch::Start() resumes the stop watch if paused, as per the docs
- added wxDirTraverser::OnOpenError() to customize the error handling
- added wxArray::SetCount()
- wxFile, wxFFile, wxTextFile and wxTempFile now all use UTF-8 encoding
by default in Unicode mode
- bug in wxDateTime with timezones on systems with tm_gmtoff in struct tm fixed
- added wx/math.h (John Labenski)
- added Catalan translations (Pau Bosch i Crespo)
- added Ukrainian translations (Eugene Manko)
- fixed bug with deleting entries at root level in wxFileConfig
- chkconf.h now includes platform-specific versions (for MSW
and Mac) which contain some tests that were in setup.h
- added event sink argument to wxEvtHandler::Connect()
- added support for POST method and alt ports to wxHTTP (Roger Chickering)
- added wxSocket::IPAddress() (Chris Mellon)
- wxDataStreams can read/write many elements at once (Mickael Gilabert)
- added wxRecursionGuard class
- added wxThreadHelper class (Daniel Howard)
- Added STL support (--enable-stl for configure, wxUSE_STL in setup.h).
When enabled, wxString will derive from std::string, wxArray from,
std::vector, wxList from std::list. In addition wxHashTable will be
implemented in terms of wxHashMap.
- Added wxList::compatibility_iterator. Can be used like wxNode* (except
it can't be delete()d). It permits writing code which will work
both with wxUSE_STL==1 and wxUSE_STL==0.
wxBase:
- added Watcom makefiles
- fixed bug with searching in sorted arrays (Jürgen Palm)
All GUI ports:
- added wxVScrolledWindow, wxVListBox and wxHtmlLbox classes
- added wxListbook control
- added alpha channel support to wxImage
- added wxRenderer class allowing to customize the drawing of generic controls
- added wxCLOSE_BOX style for dialogs and frames
- added wxSplitterWindow and wxWizard handlers to XRC
- wxWizard is now sizer-friendly and may be made resizeable (Robert Vazan)
- added proportion to wxFlexGridSizer::AddGrowableRow/Col (Maxim Babitski)
- added wxFlexGridSizer::SetFlexibleDirection() (Szczepan Holyszewski)
- implemented GetEditControl for wxGenericTreeCtrl (Peter Stieber)
- improved contrib/utils/convertrc parsing (David J. Cooke)
- fixed handling of URLs and filenames in wxFileSystem
- implemented alignment for wxGrid bool editor and renderer
- support wxListCtrl columns alignment for all platforms and not just MSW
- added wxToolBar Add/InsertTool(tool) (Janusz Piwowarski)
- added wxTB_HORZ_TEXT style for MSW and GTK (Axel Schlueter)
- fixed user dash handling for MSW and GTK (Ken Edwards)
- WXR resources can now be used in Unicode builds
- it is now possible to use several wxFileHistory objects in the same menu
by giving them different base IDs (Dimitri Schoolwerth)
- Added wxTLW::SetShape with implementations for wxMSW and wxGTK (so far)
- FL: removed const from EnableTool parameters
- FL: signal child window when toolbar is closed
- In various places, changed tests for pathsep on last char of string to call
wxEndsWithPathSeparator(s)
- Added to defs.h a couple of macros (wxPtrToULong & wxULongToPtr)
- Minor improvements to document/view framework, including
delayed deletion of a document (until after the user has chosen
a new document), and more intelligent addition of filenames to
the file history, including not adding filenames if not using the
default extension for the template
- sped up wxImage::Scale using fixed point arithmetic (Wade Brainerd)
- Added BLOB support to wxDB (John Skiff)
- wxWizard now validates when pressing Back or Next
- Implemented wxNotebook::DoGetBestSize so Fit now works
- Added FindItemByPosition to wxMenu
- wxTimer now derives from wxEvtHandler and is its own owner object by default
- Extended wxTextAttr and added wxTextCtrl::GetStyle stub
to allow better rich text support.
- implemented wxFlexGridSizer::Show() (Wade Brainerd)
- Added m_ prefix to wxColourData and wxFontData members
- Added wxHtmlPrintout::AddFilter so HTML printing can be subject to
custom filters as well as HTML viewing.
- Moved wxApp::SendIdleEvents and wxApp::ProcessIdle into common code.
- wxWindow::OnInternalIdle is now used in all ports, and ensures that
user OnIdle events do not interfere with crucial internal processing.
- wxWindow::UpdateWindowUI is now a documented function that
sends wxUpdateUIEvents, and can be overridden. It has a helper function
DoUpdateWindowUI for taking appropriate wxUpdateUIEvent action.
- Added functions to wxUpdateUIEvent: Set/GetMode, Set/GetUpdateInterval,
CanUpdate, to assist with optimising update event frequency.
- Added functions to wxIdleEvent: Set/GetMode, CanSend, to
determine whether a window should receive idle events.
- Added wxWS_EX_PROCESS_IDLE, wxWS_EX_PROCESS_UI_UPDATES window
styles for use with conservative idle and update event modes.
- send menu update events only when a menu is about to be used (MSW/GTK)
- improved event processing performance (Hans Van Leemputten)
- added wxMirrorDC class
- printing improvements: GetPageInfo() gets called after the DC has
been set and after OnPreparePrinting() has been called so it can
report the number of pages accurately; doesn't try to set
number of pages in print dialog, in common with other Windows apps;
wxHTML easy printing's preview shows number of pages
correctly; preview scrollbars are set correctly; keyboard navigation
improved
Unix:
- fixed compilation on systems with zlib installed but < 1.1.3 version
- fixed compilation on Solaris 7 with large files support enabled
- added wxTaskBarIcon implementation for X11
- added support for GNU/Hurd in configure
- wxLocale::Init now tries to set .utf8 locale in Unicode mode (Andreas Pflug)
Generic controls:
- implemented wxListCtrl::Refresh() (Norbert Berzen)
- support adding/removing columns dynamically (Donald C. Taylor)
- wxToolBarSimple, property list classes, wxTreeLayout moved
to contrib/src/deprecated
wxGTK:
- added support for label mnemonics to GTK+2 build (Michael Moss)
- added native wxMessageDialog implementation for GTK+2 build
- fixed wxMenu::Remove (John Skiff and Benjamin Williams)
- made wxTextCtrl::EmulateKeyPress() work for Delete and Backspace
- fixed wxTopLevelWindow::ShowFullScreen to work with kwin, IceWM and
window managers that support _NET_WM_STATE_FULLSCREEN
- added wxEVT_MENU_OPEN event generation
- fixed bug in generic file selector causing incomplete file extensions to
be appended to filenames with no extension
- added wxTextCtrl::SetSelection implementation for GTK+ 2
- fixed wxTextCtrl::IsEditable() for GTK+ 2
- fixed wxStaticText alignment for GTK+ 2 (Kevin Hock)
- don't consume 100% CPU when showing a popup menu
wxMac:
- generate wxEVT_SCROLL_THUMBRELEASE and wxEVT_SCROLLWIN_THUMBRELEASE events
- generate wxEVT_MENU_OPEN and wxEVT_MENU_CLOSE events
wxMSW:
- possibility to use DIBs for wxBitmap implementation (Derry Bryson)
- added wxCrashReport
- wxStaticBitmap doesn't stretch its bitmap any longer (like other ports)
- support for accelerator keys in the owner drawn menus (Derry Bryson)
- wxCaret::SetSize() doesn't hide the caret any longer as it used to
- wxCheckListBox::Check() doesn't send CHECKLISTBOX_TOGGLE event any more
- fixed bugs in wxThread::Wait() and IsAlive()
- fixed bug with wxTR_EDIT_LABELS not working with wxTR_MULTIPLE
- fixes for compilation with OpenWatcom and DigitalMars compilers
- fixed wxStaticText best size calculation (was wrong by '&' width)
- fixed calling wxFrame::Maximize(FALSE) before the window is shown
- added wxNotebook::HitTest() (Otto Wyss)
- libraries built with makefile.g95 have a _min or _cyg suffix (MinGW/Cygwin)
- when using DLL, wxLocalFSHandler was not being exported
- fixed problem with wxEvtHandler object not removed from wxPendingEvents
- Windows XP manifest is now included in wx.rc; it is no longer necessary
to ship .exe.manifest file with applications to support XP themes
- wxLocale::Init no longer reports error if trying to set Unicode-only locale
or if user's default locale is Unicode-only
- improved border handling under Windows XP
- partial fix for wxNotebook pages looking bad under XP: wxUSE_UXTHEME
enables XP theme engine code, and wxUSE_UXTHEME_AUTO tells
wxWidgets to use the theme tab colour for control backgrounds.
- disable wxNB_RIGHT, wxNB_LEFT, wxNB_BOTTOM notebook styles under Windows XP
- fixed release mode build with VC 7.x (Martin Ecker)
- added support for wxALWAYS_SHOW_SB style
- you don't need to add opengl32.lib when using VC++ now (David Falkinder)
wxMotif:
- made wxFileDialog behaviour with complex wildcards more sensible (it still
does not support all the features other ports do); refer to wxFileDialog
documentation for a detailed explanation
- implemented wxWakeUpIdle
- for Motif 2.0, used the native combobox widget instead of the GPL'd
xmcombo; xmcombo is still used for Motif 1.x and Lesstif when compiled
with Motif 1.x compatibility
- implemented wxToggleButton
- wxRadioBox and wxStaticBox now use the default shadow (border) style
instead of a sunken border
- implemented wxBitmapDataObject
- finished wxClipboard implementation
wxUniv:
- controls in toolbars now supported
wxHTML:
- added text selection to wxHtmlWindow
- added SetFonts to HTML printing classes (Adrian Philip Look)
- it is now possible to force page break when printing by inserting
<div style="page-break-before:always"> into the markup (Greg Chicares)
- wxHtmlWindow now uses double buffering to prevent flicker
Diffstat (limited to 'x11/wxGTK')
| -rw-r--r-- | x11/wxGTK/DESCR | 45 | ||||
| -rw-r--r-- | x11/wxGTK/Makefile | 4 | ||||
| -rw-r--r-- | x11/wxGTK/Makefile.common | 31 | ||||
| -rw-r--r-- | x11/wxGTK/PLIST | 910 | ||||
| -rw-r--r-- | x11/wxGTK/buildlink3.mk | 12 | ||||
| -rw-r--r-- | x11/wxGTK/distinfo | 19 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-aa | 30 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ab | 397 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ac | 79 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ad | 13 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ae | 17 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-af | 17 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ag | 22 | ||||
| -rw-r--r-- | x11/wxGTK/patches/patch-ah | 10 |
14 files changed, 577 insertions, 1029 deletions
diff --git a/x11/wxGTK/DESCR b/x11/wxGTK/DESCR index cb1ecef6117..60051fbe367 100644 --- a/x11/wxGTK/DESCR +++ b/x11/wxGTK/DESCR @@ -1,24 +1,27 @@ -A GTK+-based implementation of the wxWidgets cross-platform GUI library. +A GTK+-based implementation of the wxWidgets cross-platform GUI +library. -wxWidgets is a set of libraries that allows C++ applications to compile and -run on several different types of computer, with minimal source code changes. -There is one library per supported GUI (such as Windows, GTK+, Motif, and -Mac). As well as providing a common API (Application Programming Interface) -for GUI functionality, it provides functionality for accessing some -commonly-used operating system facilities, from copying and deleting files -to socket and thread support. wxWidgets is a 'framework' in the sense that -it provides a lot of built-in functionality, which the application can use -or replace as required, thus saving a great deal of coding effort. Basic data -structures such as strings, arrays, linked lists and hash tables are also -supported. +wxWidgets is a set of libraries that allows C++ applications to +compile and run on several different types of computer, with minimal +source code changes. There is one library per supported GUI (such +as Windows, GTK+, Motif, and Mac). As well as providing a common +API (Application Programming Interface) for GUI functionality, it +provides functionality for accessing some commonly-used operating +system facilities, from copying and deleting files to socket and +thread support. wxWidgets is a 'framework' in the sense that it +provides a lot of built-in functionality, which the application +can use or replace as required, thus saving a great deal of coding +effort. Basic data structures such as strings, arrays, linked lists +and hash tables are also supported. -Such a toolkit is not unique - there are others to choose from - but wxWidgets -is free, well-established, well-documented, and very broad in its coverage -of GUI functionality. It has some extras that make it stand out from the -crowd, such as the many convenience dialogs, built-in HTML display and -printing, virtual filesystems, easy-to-use OLE automation controller class, -Open GL support, and many other features that make it easier to write modern -and user-friendly applications. +Such a toolkit is not unique - there are others to choose from - +but wxWidgets is free, well-established, well-documented, and very +broad in its coverage of GUI functionality. It has some extras that +make it stand out from the crowd, such as the many convenience +dialogs, built-in HTML display and printing, virtual filesystems, +easy-to-use OLE automation controller class, Open GL support, and +many other features that make it easier to write modern and +user-friendly applications. -There is also a python interface available, wxPython (see the py-wxWidgets -package). +There is also a python interface available, wxPython (see the +py-wxWidgets package). diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile index 0e45fe697ce..89595430617 100644 --- a/x11/wxGTK/Makefile +++ b/x11/wxGTK/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2005/07/24 21:14:51 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2005/08/07 11:26:17 wiz Exp $ # .include "Makefile.common" -PKGREVISION= 5 COMMENT= GTK-based implementation of the wxWidgets GUI library post-install: @@ -11,4 +10,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCDIR}/LICENSE .include "../../graphics/glu/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common index 79c2d2c5fee..2fbc848c69c 100644 --- a/x11/wxGTK/Makefile.common +++ b/x11/wxGTK/Makefile.common @@ -1,46 +1,32 @@ -# $NetBSD: Makefile.common,v 1.1 2005/07/24 21:14:51 wiz Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/08/07 11:26:17 wiz Exp $ # -DISTNAME= wxGTK-2.4.2 +DISTNAME= wxGTK-2.6.1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxwindows/} EXTRACT_SUFX= .tar.bz2 -MAINTAINER= tsarna@NetBSD.org +MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.wxwidgets.org/ PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo USE_PKGLOCALEDIR= YES -USE_LIBTOOL= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-opengl +USE_GNU_CONFIGURE_HOST= NO +CONFIGURE_ARGS+= --with-gtk=2 CONFIGURE_ARGS+= --with-libjpeg=sys -CONFIGURE_ARGS+= --with-zlib=sys CONFIGURE_ARGS+= --with-libpng=sys CONFIGURE_ARGS+= --with-libtiff=sys +CONFIGURE_ARGS+= --with-opengl +CONFIGURE_ARGS+= --with-zlib=sys CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR} CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this -DOCDIR= ${PREFIX}/share/doc/wx/gtk - -.include "../../mk/bsd.prefs.mk" - -# This is needed for gtk1 and gtk2 on some platforms and -# it doesn't hurt on those which don't need it -CONFIGURE_ARGS+= --with-gtk - -.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss]) -PLIST_SUBST+= GTKVER= -.include "../../x11/gtk/buildlink3.mk" -.else -CONFIGURE_ARGS+= --enable-gtk2 -PLIST_SUBST+= GTKVER=2 -.include "../../x11/gtk2/buildlink3.mk" -.endif +DOCDIR= ${PREFIX}/share/doc/wxGTK .include "../../devel/pkg-config/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" @@ -48,6 +34,7 @@ PLIST_SUBST+= GTKVER=2 .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/x11.buildlink3.mk" diff --git a/x11/wxGTK/PLIST b/x11/wxGTK/PLIST index a5b0587ae23..43c45ee2e10 100644 --- a/x11/wxGTK/PLIST +++ b/x11/wxGTK/PLIST @@ -1,433 +1,511 @@ -@comment $NetBSD: PLIST,v 1.7 2005/07/24 21:14:51 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2005/08/07 11:26:17 wiz Exp $ bin/wx-config -bin/wxgtk${GTKVER}-2.4-config -include/wx/accel.h -include/wx/app.h -include/wx/arrimpl.cpp -include/wx/artprov.h -include/wx/bitmap.h -include/wx/bmpbuttn.h -include/wx/brush.h -include/wx/buffer.h -include/wx/build.h -include/wx/busyinfo.h -include/wx/button.h -include/wx/calctrl.h -include/wx/caret.h -include/wx/checkbox.h -include/wx/checklst.h -include/wx/chkconf.h -include/wx/choicdlg.h -include/wx/choice.h -include/wx/clipbrd.h -include/wx/clntdata.h -include/wx/cmdline.h -include/wx/cmdproc.h -include/wx/cmndata.h -include/wx/colordlg.h -include/wx/colour.h -include/wx/combobox.h -include/wx/confbase.h -include/wx/config.h -include/wx/containr.h -include/wx/control.h -include/wx/cshelp.h -include/wx/ctrlsub.h -include/wx/cursor.h -include/wx/dataobj.h -include/wx/date.h -include/wx/datetime.h -include/wx/datetime.inl -include/wx/datstrm.h -include/wx/db.h -include/wx/dbgrid.h -include/wx/dbkeyg.h -include/wx/dbtable.h -include/wx/dc.h -include/wx/dcbuffer.h -include/wx/dcclient.h -include/wx/dcmemory.h -include/wx/dcprint.h -include/wx/dcps.h -include/wx/dcscreen.h -include/wx/dde.h -include/wx/debug.h -include/wx/defs.h -include/wx/dialog.h -include/wx/dialup.h -include/wx/dir.h -include/wx/dirctrl.h -include/wx/dirdlg.h -include/wx/dnd.h -include/wx/docmdi.h -include/wx/docview.h -include/wx/dragimag.h -include/wx/dynarray.h -include/wx/dynlib.h -include/wx/dynload.h -include/wx/effects.h -include/wx/encconv.h -include/wx/event.h -include/wx/expr.h -include/wx/fdrepdlg.h -include/wx/features.h -include/wx/ffile.h -include/wx/file.h -include/wx/fileconf.h -include/wx/filedlg.h -include/wx/filefn.h -include/wx/filename.h -include/wx/filesys.h -include/wx/font.h -include/wx/fontdlg.h -include/wx/fontenc.h -include/wx/fontenum.h -include/wx/fontmap.h -include/wx/fontutil.h -include/wx/frame.h -include/wx/fs_inet.h -include/wx/fs_mem.h -include/wx/fs_zip.h -include/wx/gauge.h -include/wx/gdicmn.h -include/wx/gdiobj.h -include/wx/generic/accel.h -include/wx/generic/calctrl.h -include/wx/generic/caret.h -include/wx/generic/choicdgg.h -include/wx/generic/colrdlgg.h -include/wx/generic/dcpsg.h -include/wx/generic/dirctrlg.h -include/wx/generic/dirdlgg.h -include/wx/generic/dragimgg.h -include/wx/generic/fdrepdlg.h -include/wx/generic/filedlgg.h -include/wx/generic/fontdlgg.h -include/wx/generic/grid.h -include/wx/generic/gridctrl.h -include/wx/generic/gridg.h -include/wx/generic/helpext.h -include/wx/generic/helphtml.h -include/wx/generic/imaglist.h -include/wx/generic/laywin.h -include/wx/generic/listctrl.h -include/wx/generic/msgdlgg.h -include/wx/generic/notebook.h -include/wx/generic/paletteg.h -include/wx/generic/panelg.h -include/wx/generic/printps.h -include/wx/generic/prntdlgg.h -include/wx/generic/progdlgg.h -include/wx/generic/sashwin.h -include/wx/generic/scrolwin.h -include/wx/generic/spinctlg.h -include/wx/generic/splash.h -include/wx/generic/splitter.h -include/wx/generic/statusbr.h -include/wx/generic/tabg.h -include/wx/generic/textdlgg.h -include/wx/generic/timer.h -include/wx/generic/treectlg.h -include/wx/generic/wizard.h -include/wx/geometry.h -include/wx/gifdecod.h -include/wx/glcanvas.h -include/wx/grid.h -include/wx/gsocket.h -include/wx/gtk/accel.h -include/wx/gtk/app.h -include/wx/gtk/bitmap.h -include/wx/gtk/bmpbuttn.h -include/wx/gtk/brush.h -include/wx/gtk/button.h -include/wx/gtk/checkbox.h -include/wx/gtk/checklst.h -include/wx/gtk/choice.h -include/wx/gtk/clipbrd.h -include/wx/gtk/colour.h -include/wx/gtk/combobox.h -include/wx/gtk/control.h -include/wx/gtk/cursor.h -include/wx/gtk/dataform.h -include/wx/gtk/dataobj.h -include/wx/gtk/dataobj2.h -include/wx/gtk/dc.h -include/wx/gtk/dcclient.h -include/wx/gtk/dcmemory.h -include/wx/gtk/dcscreen.h -include/wx/gtk/dialog.h -include/wx/gtk/dnd.h -include/wx/gtk/filedlg.h -include/wx/gtk/font.h -include/wx/gtk/fontdlg.h -include/wx/gtk/frame.h -include/wx/gtk/gauge.h -include/wx/gtk/gdiobj.h -include/wx/gtk/glcanvas.h -include/wx/gtk/icon.h -include/wx/gtk/joystick.h -include/wx/gtk/listbox.h -include/wx/gtk/mdi.h -include/wx/gtk/menu.h -include/wx/gtk/menuitem.h -include/wx/gtk/minifram.h -include/wx/gtk/notebook.h -include/wx/gtk/pen.h -include/wx/gtk/popupwin.h -include/wx/gtk/radiobox.h -include/wx/gtk/radiobut.h -include/wx/gtk/region.h -include/wx/gtk/scrolbar.h -include/wx/gtk/scrolwin.h -include/wx/gtk/slider.h -include/wx/gtk/spinbutt.h -include/wx/gtk/spinctrl.h -include/wx/gtk/statbmp.h -include/wx/gtk/statbox.h -include/wx/gtk/statline.h -include/wx/gtk/stattext.h -include/wx/gtk/tbargtk.h -include/wx/gtk/textctrl.h -include/wx/gtk/tglbtn.h -include/wx/gtk/timer.h -include/wx/gtk/tooltip.h -include/wx/gtk/toplevel.h -include/wx/gtk/treectrl.h -include/wx/gtk/wave.h -include/wx/gtk/win_gtk.h -include/wx/gtk/window.h -include/wx/hash.h -include/wx/hashmap.h -include/wx/help.h -include/wx/helpbase.h -include/wx/helphtml.h -include/wx/helpwin.h -include/wx/html/forcelnk.h -include/wx/html/helpctrl.h -include/wx/html/helpdata.h -include/wx/html/helpfrm.h -include/wx/html/htmlcell.h -include/wx/html/htmldefs.h -include/wx/html/htmlfilt.h -include/wx/html/htmlpars.h -include/wx/html/htmltag.h -include/wx/html/htmlwin.h -include/wx/html/htmprint.h -include/wx/html/m_templ.h -include/wx/html/winpars.h -include/wx/icon.h -include/wx/iconbndl.h -include/wx/imagbmp.h -include/wx/image.h -include/wx/imaggif.h -include/wx/imagiff.h -include/wx/imagjpeg.h -include/wx/imaglist.h -include/wx/imagpcx.h -include/wx/imagpng.h -include/wx/imagpnm.h -include/wx/imagtiff.h -include/wx/imagxpm.h -include/wx/intl.h -include/wx/ioswrap.h -include/wx/ipc.h -include/wx/ipcbase.h -include/wx/isql.h -include/wx/isqlext.h -include/wx/joystick.h -include/wx/layout.h -include/wx/laywin.h -include/wx/list.h -include/wx/listbase.h -include/wx/listbox.h -include/wx/listctrl.h -include/wx/listimpl.cpp -include/wx/log.h -include/wx/longlong.h -include/wx/matrix.h -include/wx/mdi.h -include/wx/memconf.h -include/wx/memory.h -include/wx/memtext.h -include/wx/menu.h -include/wx/menuitem.h -include/wx/metafile.h -include/wx/mimetype.h -include/wx/minifram.h -include/wx/module.h -include/wx/msgdlg.h -include/wx/msgout.h -include/wx/mstream.h -include/wx/notebook.h -include/wx/object.h -include/wx/odbc.h -include/wx/ownerdrw.h -include/wx/palette.h -include/wx/panel.h -include/wx/paper.h -include/wx/pen.h -include/wx/platform.h -include/wx/popupwin.h -include/wx/print.h -include/wx/printdlg.h -include/wx/prntbase.h -include/wx/process.h -include/wx/progdlg.h -include/wx/prop.h -include/wx/propform.h -include/wx/proplist.h -include/wx/protocol/file.h -include/wx/protocol/ftp.h -include/wx/protocol/http.h -include/wx/protocol/protocol.h -include/wx/quantize.h -include/wx/radiobox.h -include/wx/radiobut.h -include/wx/regex.h -include/wx/region.h -include/wx/resource.h -include/wx/sashwin.h -include/wx/sckaddr.h -include/wx/sckipc.h -include/wx/sckstrm.h -include/wx/scrolbar.h -include/wx/scrolwin.h -include/wx/settings.h -include/wx/sizer.h -include/wx/slider.h -include/wx/snglinst.h -include/wx/socket.h -include/wx/spinbutt.h -include/wx/spinctrl.h -include/wx/splash.h -include/wx/splitter.h -include/wx/stack.h -include/wx/statbmp.h -include/wx/statbox.h -include/wx/statline.h -include/wx/stattext.h -include/wx/statusbr.h -include/wx/strconv.h -include/wx/stream.h -include/wx/string.h -include/wx/sysopt.h -include/wx/tab.h -include/wx/tabctrl.h -include/wx/taskbar.h -include/wx/tbarbase.h -include/wx/tbarsmpl.h -include/wx/textbuf.h -include/wx/textctrl.h -include/wx/textdlg.h -include/wx/textfile.h -include/wx/tglbtn.h -include/wx/thread.h -include/wx/thrimpl.cpp -include/wx/time.h -include/wx/timer.h -include/wx/tipdlg.h -include/wx/tipwin.h -include/wx/tokenzr.h -include/wx/toolbar.h -include/wx/tooltip.h -include/wx/toplevel.h -include/wx/treebase.h -include/wx/treectrl.h -include/wx/txtstrm.h -include/wx/types.h -include/wx/unix/execute.h -include/wx/unix/fontutil.h -include/wx/unix/gsockunx.h -include/wx/unix/mimetype.h -include/wx/unix/utilsx11.h -include/wx/url.h -include/wx/utils.h -include/wx/valgen.h -include/wx/validate.h -include/wx/valtext.h -include/wx/variant.h -include/wx/vector.h -include/wx/version.h -include/wx/volume.h -include/wx/wave.h -include/wx/wfstream.h -include/wx/window.h -include/wx/wizard.h -include/wx/wx.h -include/wx/wx_cw.h -include/wx/wx_cw_cm.h -include/wx/wx_cw_d.h -include/wx/wxchar.h -include/wx/wxexpr.h -include/wx/wxhtml.h -include/wx/wxprec.h -include/wx/xpmdecod.h -include/wx/zipstrm.h -include/wx/zstream.h -lib/libwx_gtk${GTKVER}.la -lib/libwx_gtk${GTKVER}_gl-2.4.la -lib/wx/include/gtk${GTKVER}-2.4/wx/setup.h +bin/wxrc +bin/wxrc-2.6 +include/wx-2.6/wx/accel.h +include/wx-2.6/wx/access.h +include/wx-2.6/wx/afterstd.h +include/wx-2.6/wx/app.h +include/wx-2.6/wx/apptrait.h +include/wx-2.6/wx/archive.h +include/wx-2.6/wx/arrimpl.cpp +include/wx-2.6/wx/arrstr.h +include/wx-2.6/wx/artprov.h +include/wx-2.6/wx/beforestd.h +include/wx-2.6/wx/bitmap.h +include/wx-2.6/wx/bmpbuttn.h +include/wx-2.6/wx/bookctrl.h +include/wx-2.6/wx/brush.h +include/wx-2.6/wx/buffer.h +include/wx-2.6/wx/build.h +include/wx-2.6/wx/busyinfo.h +include/wx-2.6/wx/button.h +include/wx-2.6/wx/calctrl.h +include/wx-2.6/wx/caret.h +include/wx-2.6/wx/checkbox.h +include/wx-2.6/wx/checklst.h +include/wx-2.6/wx/chkconf.h +include/wx-2.6/wx/choicdlg.h +include/wx-2.6/wx/choice.h +include/wx-2.6/wx/choicebk.h +include/wx-2.6/wx/clipbrd.h +include/wx-2.6/wx/clntdata.h +include/wx-2.6/wx/cmdline.h +include/wx-2.6/wx/cmdproc.h +include/wx-2.6/wx/cmndata.h +include/wx-2.6/wx/colordlg.h +include/wx-2.6/wx/colour.h +include/wx-2.6/wx/combobox.h +include/wx-2.6/wx/confbase.h +include/wx-2.6/wx/config.h +include/wx-2.6/wx/containr.h +include/wx-2.6/wx/control.h +include/wx-2.6/wx/cshelp.h +include/wx-2.6/wx/ctrlsub.h +include/wx-2.6/wx/cursor.h +include/wx-2.6/wx/dataobj.h +include/wx-2.6/wx/datectrl.h +include/wx-2.6/wx/dateevt.h +include/wx-2.6/wx/datetime.h +include/wx-2.6/wx/datstrm.h +include/wx-2.6/wx/db.h +include/wx-2.6/wx/dbgrid.h +include/wx-2.6/wx/dbkeyg.h +include/wx-2.6/wx/dbtable.h +include/wx-2.6/wx/dc.h +include/wx-2.6/wx/dcbuffer.h +include/wx-2.6/wx/dcclient.h +include/wx-2.6/wx/dcmemory.h +include/wx-2.6/wx/dcmirror.h +include/wx-2.6/wx/dcprint.h +include/wx-2.6/wx/dcps.h +include/wx-2.6/wx/dcscreen.h +include/wx-2.6/wx/dde.h +include/wx-2.6/wx/debug.h +include/wx-2.6/wx/debugrpt.h +include/wx-2.6/wx/defs.h +include/wx-2.6/wx/dialog.h +include/wx-2.6/wx/dialup.h +include/wx-2.6/wx/dir.h +include/wx-2.6/wx/dirctrl.h +include/wx-2.6/wx/dirdlg.h +include/wx-2.6/wx/display.h +include/wx-2.6/wx/dlimpexp.h +include/wx-2.6/wx/dnd.h +include/wx-2.6/wx/docmdi.h +include/wx-2.6/wx/docview.h +include/wx-2.6/wx/dragimag.h +include/wx-2.6/wx/dynarray.h +include/wx-2.6/wx/dynlib.h +include/wx-2.6/wx/dynload.h +include/wx-2.6/wx/effects.h +include/wx-2.6/wx/encconv.h +include/wx-2.6/wx/encinfo.h +include/wx-2.6/wx/event.h +include/wx-2.6/wx/evtloop.h +include/wx-2.6/wx/except.h +include/wx-2.6/wx/fdrepdlg.h +include/wx-2.6/wx/features.h +include/wx-2.6/wx/ffile.h +include/wx-2.6/wx/file.h +include/wx-2.6/wx/fileconf.h +include/wx-2.6/wx/filedlg.h +include/wx-2.6/wx/filefn.h +include/wx-2.6/wx/filename.h +include/wx-2.6/wx/filesys.h +include/wx-2.6/wx/fmappriv.h +include/wx-2.6/wx/font.h +include/wx-2.6/wx/fontdlg.h +include/wx-2.6/wx/fontenc.h +include/wx-2.6/wx/fontenum.h +include/wx-2.6/wx/fontmap.h +include/wx-2.6/wx/fontutil.h +include/wx-2.6/wx/frame.h +include/wx-2.6/wx/fs_inet.h +include/wx-2.6/wx/fs_mem.h +include/wx-2.6/wx/fs_zip.h +include/wx-2.6/wx/gauge.h +include/wx-2.6/wx/gbsizer.h +include/wx-2.6/wx/gdicmn.h +include/wx-2.6/wx/gdiobj.h +include/wx-2.6/wx/generic/accel.h +include/wx-2.6/wx/generic/calctrl.h +include/wx-2.6/wx/generic/caret.h +include/wx-2.6/wx/generic/choicdgg.h +include/wx-2.6/wx/generic/colrdlgg.h +include/wx-2.6/wx/generic/datectrl.h +include/wx-2.6/wx/generic/dcpsg.h +include/wx-2.6/wx/generic/dirctrlg.h +include/wx-2.6/wx/generic/dirdlgg.h +include/wx-2.6/wx/generic/dragimgg.h +include/wx-2.6/wx/generic/fdrepdlg.h +include/wx-2.6/wx/generic/filedlgg.h +include/wx-2.6/wx/generic/fontdlgg.h +include/wx-2.6/wx/generic/grid.h +include/wx-2.6/wx/generic/gridctrl.h +include/wx-2.6/wx/generic/gridsel.h +include/wx-2.6/wx/generic/helpext.h +include/wx-2.6/wx/generic/imaglist.h +include/wx-2.6/wx/generic/laywin.h +include/wx-2.6/wx/generic/listctrl.h +include/wx-2.6/wx/generic/logg.h +include/wx-2.6/wx/generic/msgdlgg.h +include/wx-2.6/wx/generic/notebook.h +include/wx-2.6/wx/generic/numdlgg.h +include/wx-2.6/wx/generic/paletteg.h +include/wx-2.6/wx/generic/panelg.h +include/wx-2.6/wx/generic/printps.h +include/wx-2.6/wx/generic/prntdlgg.h +include/wx-2.6/wx/generic/progdlgg.h +include/wx-2.6/wx/generic/propdlg.h +include/wx-2.6/wx/generic/sashwin.h +include/wx-2.6/wx/generic/scrolwin.h +include/wx-2.6/wx/generic/spinctlg.h +include/wx-2.6/wx/generic/splash.h +include/wx-2.6/wx/generic/splitter.h +include/wx-2.6/wx/generic/statusbr.h +include/wx-2.6/wx/generic/tabg.h +include/wx-2.6/wx/generic/textdlgg.h +include/wx-2.6/wx/generic/timer.h +include/wx-2.6/wx/generic/treectlg.h +include/wx-2.6/wx/generic/wizard.h +include/wx-2.6/wx/geometry.h +include/wx-2.6/wx/gifdecod.h +include/wx-2.6/wx/glcanvas.h +include/wx-2.6/wx/grid.h +include/wx-2.6/wx/gsocket.h +include/wx-2.6/wx/gtk/accel.h +include/wx-2.6/wx/gtk/app.h +include/wx-2.6/wx/gtk/bitmap.h +include/wx-2.6/wx/gtk/bmpbuttn.h +include/wx-2.6/wx/gtk/brush.h +include/wx-2.6/wx/gtk/button.h +include/wx-2.6/wx/gtk/checkbox.h +include/wx-2.6/wx/gtk/checklst.h +include/wx-2.6/wx/gtk/choice.h +include/wx-2.6/wx/gtk/clipbrd.h +include/wx-2.6/wx/gtk/colordlg.h +include/wx-2.6/wx/gtk/colour.h +include/wx-2.6/wx/gtk/combobox.h +include/wx-2.6/wx/gtk/control.h +include/wx-2.6/wx/gtk/cursor.h +include/wx-2.6/wx/gtk/dataform.h +include/wx-2.6/wx/gtk/dataobj.h +include/wx-2.6/wx/gtk/dataobj2.h +include/wx-2.6/wx/gtk/dc.h +include/wx-2.6/wx/gtk/dcclient.h +include/wx-2.6/wx/gtk/dcmemory.h +include/wx-2.6/wx/gtk/dcscreen.h +include/wx-2.6/wx/gtk/dialog.h +include/wx-2.6/wx/gtk/dnd.h +include/wx-2.6/wx/gtk/filedlg.h +include/wx-2.6/wx/gtk/font.h +include/wx-2.6/wx/gtk/fontdlg.h +include/wx-2.6/wx/gtk/frame.h +include/wx-2.6/wx/gtk/gauge.h +include/wx-2.6/wx/gtk/gdiobj.h +include/wx-2.6/wx/gtk/glcanvas.h +include/wx-2.6/wx/gtk/gnome/gprint.h +include/wx-2.6/wx/gtk/icon.h +include/wx-2.6/wx/gtk/listbox.h +include/wx-2.6/wx/gtk/mdi.h +include/wx-2.6/wx/gtk/menu.h +include/wx-2.6/wx/gtk/menuitem.h +include/wx-2.6/wx/gtk/minifram.h +include/wx-2.6/wx/gtk/msgdlg.h +include/wx-2.6/wx/gtk/notebook.h +include/wx-2.6/wx/gtk/pen.h +include/wx-2.6/wx/gtk/popupwin.h +include/wx-2.6/wx/gtk/radiobox.h +include/wx-2.6/wx/gtk/radiobut.h +include/wx-2.6/wx/gtk/region.h +include/wx-2.6/wx/gtk/scrolbar.h +include/wx-2.6/wx/gtk/scrolwin.h +include/wx-2.6/wx/gtk/slider.h +include/wx-2.6/wx/gtk/spinbutt.h +include/wx-2.6/wx/gtk/spinctrl.h +include/wx-2.6/wx/gtk/statbmp.h +include/wx-2.6/wx/gtk/statbox.h +include/wx-2.6/wx/gtk/statline.h +include/wx-2.6/wx/gtk/stattext.h +include/wx-2.6/wx/gtk/tbargtk.h +include/wx-2.6/wx/gtk/textctrl.h +include/wx-2.6/wx/gtk/tglbtn.h +include/wx-2.6/wx/gtk/timer.h +include/wx-2.6/wx/gtk/tooltip.h +include/wx-2.6/wx/gtk/toplevel.h +include/wx-2.6/wx/gtk/treectrl.h +include/wx-2.6/wx/gtk/win_gtk.h +include/wx-2.6/wx/gtk/window.h +include/wx-2.6/wx/hash.h +include/wx-2.6/wx/hashmap.h +include/wx-2.6/wx/hashset.h +include/wx-2.6/wx/help.h +include/wx-2.6/wx/helpbase.h +include/wx-2.6/wx/helphtml.h +include/wx-2.6/wx/helpwin.h +include/wx-2.6/wx/html/forcelnk.h +include/wx-2.6/wx/html/helpctrl.h +include/wx-2.6/wx/html/helpdata.h +include/wx-2.6/wx/html/helpfrm.h +include/wx-2.6/wx/html/htmlcell.h +include/wx-2.6/wx/html/htmldefs.h +include/wx-2.6/wx/html/htmlfilt.h +include/wx-2.6/wx/html/htmlpars.h +include/wx-2.6/wx/html/htmlproc.h +include/wx-2.6/wx/html/htmltag.h +include/wx-2.6/wx/html/htmlwin.h +include/wx-2.6/wx/html/htmprint.h +include/wx-2.6/wx/html/m_templ.h +include/wx-2.6/wx/html/winpars.h +include/wx-2.6/wx/htmllbox.h +include/wx-2.6/wx/icon.h +include/wx-2.6/wx/iconbndl.h +include/wx-2.6/wx/iconloc.h +include/wx-2.6/wx/imagbmp.h +include/wx-2.6/wx/image.h +include/wx-2.6/wx/imaggif.h +include/wx-2.6/wx/imagiff.h +include/wx-2.6/wx/imagjpeg.h +include/wx-2.6/wx/imaglist.h +include/wx-2.6/wx/imagpcx.h +include/wx-2.6/wx/imagpng.h +include/wx-2.6/wx/imagpnm.h +include/wx-2.6/wx/imagtiff.h +include/wx-2.6/wx/imagxpm.h +include/wx-2.6/wx/init.h +include/wx-2.6/wx/intl.h +include/wx-2.6/wx/iosfwrap.h +include/wx-2.6/wx/ioswrap.h +include/wx-2.6/wx/ipc.h +include/wx-2.6/wx/ipcbase.h +include/wx-2.6/wx/isql.h +include/wx-2.6/wx/isqlext.h +include/wx-2.6/wx/joystick.h +include/wx-2.6/wx/layout.h +include/wx-2.6/wx/laywin.h +include/wx-2.6/wx/list.h +include/wx-2.6/wx/listbase.h +include/wx-2.6/wx/listbook.h +include/wx-2.6/wx/listbox.h +include/wx-2.6/wx/listctrl.h +include/wx-2.6/wx/listimpl.cpp +include/wx-2.6/wx/log.h +include/wx-2.6/wx/longlong.h +include/wx-2.6/wx/math.h +include/wx-2.6/wx/matrix.h +include/wx-2.6/wx/mdi.h +include/wx-2.6/wx/mediactrl.h +include/wx-2.6/wx/memconf.h +include/wx-2.6/wx/memory.h +include/wx-2.6/wx/memtext.h +include/wx-2.6/wx/menu.h +include/wx-2.6/wx/menuitem.h +include/wx-2.6/wx/metafile.h +include/wx-2.6/wx/mimetype.h +include/wx-2.6/wx/minifram.h +include/wx-2.6/wx/module.h +include/wx-2.6/wx/msgdlg.h +include/wx-2.6/wx/msgout.h +include/wx-2.6/wx/mstream.h +include/wx-2.6/wx/notebook.h +include/wx-2.6/wx/numdlg.h +include/wx-2.6/wx/object.h +include/wx-2.6/wx/ownerdrw.h +include/wx-2.6/wx/palette.h +include/wx-2.6/wx/panel.h +include/wx-2.6/wx/paper.h +include/wx-2.6/wx/pen.h +include/wx-2.6/wx/platform.h +include/wx-2.6/wx/popupwin.h +include/wx-2.6/wx/print.h +include/wx-2.6/wx/printdlg.h +include/wx-2.6/wx/prntbase.h +include/wx-2.6/wx/process.h +include/wx-2.6/wx/progdlg.h +include/wx-2.6/wx/propdlg.h +include/wx-2.6/wx/protocol/file.h +include/wx-2.6/wx/protocol/ftp.h +include/wx-2.6/wx/protocol/http.h +include/wx-2.6/wx/protocol/protocol.h +include/wx-2.6/wx/ptr_scpd.h +include/wx-2.6/wx/quantize.h +include/wx-2.6/wx/radiobox.h +include/wx-2.6/wx/radiobut.h +include/wx-2.6/wx/rawbmp.h +include/wx-2.6/wx/regex.h +include/wx-2.6/wx/region.h +include/wx-2.6/wx/renderer.h +include/wx-2.6/wx/sashwin.h +include/wx-2.6/wx/sckaddr.h +include/wx-2.6/wx/sckipc.h +include/wx-2.6/wx/sckstrm.h +include/wx-2.6/wx/scopeguard.h +include/wx-2.6/wx/scrolbar.h +include/wx-2.6/wx/scrolwin.h +include/wx-2.6/wx/selstore.h +include/wx-2.6/wx/settings.h +include/wx-2.6/wx/sizer.h +include/wx-2.6/wx/slider.h +include/wx-2.6/wx/snglinst.h +include/wx-2.6/wx/socket.h +include/wx-2.6/wx/sound.h +include/wx-2.6/wx/spinbutt.h +include/wx-2.6/wx/spinctrl.h +include/wx-2.6/wx/splash.h +include/wx-2.6/wx/splitter.h +include/wx-2.6/wx/sstream.h +include/wx-2.6/wx/stack.h +include/wx-2.6/wx/stackwalk.h +include/wx-2.6/wx/statbmp.h +include/wx-2.6/wx/statbox.h +include/wx-2.6/wx/statline.h +include/wx-2.6/wx/stattext.h +include/wx-2.6/wx/statusbr.h +include/wx-2.6/wx/stdpaths.h +include/wx-2.6/wx/stockitem.h +include/wx-2.6/wx/stopwatch.h +include/wx-2.6/wx/strconv.h +include/wx-2.6/wx/stream.h +include/wx-2.6/wx/string.h +include/wx-2.6/wx/sysopt.h +include/wx-2.6/wx/tab.h +include/wx-2.6/wx/tabctrl.h +include/wx-2.6/wx/taskbar.h +include/wx-2.6/wx/tbarbase.h +include/wx-2.6/wx/textbuf.h +include/wx-2.6/wx/textctrl.h +include/wx-2.6/wx/textdlg.h +include/wx-2.6/wx/textfile.h +include/wx-2.6/wx/tglbtn.h +include/wx-2.6/wx/thread.h +include/wx-2.6/wx/thrimpl.cpp +include/wx-2.6/wx/timer.h +include/wx-2.6/wx/tipdlg.h +include/wx-2.6/wx/tipwin.h +include/wx-2.6/wx/tokenzr.h +include/wx-2.6/wx/toolbar.h +include/wx-2.6/wx/tooltip.h +include/wx-2.6/wx/toplevel.h +include/wx-2.6/wx/treebase.h +include/wx-2.6/wx/treectrl.h +include/wx-2.6/wx/txtstrm.h +include/wx-2.6/wx/types.h +include/wx-2.6/wx/unix/apptbase.h +include/wx-2.6/wx/unix/apptrait.h +include/wx-2.6/wx/unix/displayx11.h +include/wx-2.6/wx/unix/execute.h +include/wx-2.6/wx/unix/fontutil.h +include/wx-2.6/wx/unix/gsockunx.h +include/wx-2.6/wx/unix/joystick.h +include/wx-2.6/wx/unix/mimetype.h +include/wx-2.6/wx/unix/pipe.h +include/wx-2.6/wx/unix/sound.h +include/wx-2.6/wx/unix/stackwalk.h +include/wx-2.6/wx/unix/stdpaths.h +include/wx-2.6/wx/unix/taskbarx11.h +include/wx-2.6/wx/unix/utilsx11.h +include/wx-2.6/wx/uri.h +include/wx-2.6/wx/url.h +include/wx-2.6/wx/utils.h +include/wx-2.6/wx/valgen.h +include/wx-2.6/wx/validate.h +include/wx-2.6/wx/valtext.h +include/wx-2.6/wx/variant.h +include/wx-2.6/wx/vector.h +include/wx-2.6/wx/version.h +include/wx-2.6/wx/vidmode.h +include/wx-2.6/wx/vlbox.h +include/wx-2.6/wx/vms_x_fix.h +include/wx-2.6/wx/volume.h +include/wx-2.6/wx/vscroll.h +include/wx-2.6/wx/wave.h +include/wx-2.6/wx/wfstream.h +include/wx-2.6/wx/window.h +include/wx-2.6/wx/wizard.h +include/wx-2.6/wx/wx.h +include/wx-2.6/wx/wxchar.h +include/wx-2.6/wx/wxhtml.h +include/wx-2.6/wx/wxprec.h +include/wx-2.6/wx/xml/xml.h +include/wx-2.6/wx/xpmdecod.h +include/wx-2.6/wx/xpmhand.h +include/wx-2.6/wx/xrc/xh_all.h +include/wx-2.6/wx/xrc/xh_bmp.h +include/wx-2.6/wx/xrc/xh_bmpbt.h +include/wx-2.6/wx/xrc/xh_bttn.h +include/wx-2.6/wx/xrc/xh_cald.h +include/wx-2.6/wx/xrc/xh_chckb.h +include/wx-2.6/wx/xrc/xh_chckl.h +include/wx-2.6/wx/xrc/xh_choic.h +include/wx-2.6/wx/xrc/xh_choicbk.h +include/wx-2.6/wx/xrc/xh_combo.h +include/wx-2.6/wx/xrc/xh_datectrl.h +include/wx-2.6/wx/xrc/xh_dlg.h +include/wx-2.6/wx/xrc/xh_frame.h +include/wx-2.6/wx/xrc/xh_gauge.h +include/wx-2.6/wx/xrc/xh_gdctl.h +include/wx-2.6/wx/xrc/xh_html.h +include/wx-2.6/wx/xrc/xh_listb.h +include/wx-2.6/wx/xrc/xh_listbk.h +include/wx-2.6/wx/xrc/xh_listc.h +include/wx-2.6/wx/xrc/xh_mdi.h +include/wx-2.6/wx/xrc/xh_menu.h +include/wx-2.6/wx/xrc/xh_notbk.h +include/wx-2.6/wx/xrc/xh_panel.h +include/wx-2.6/wx/xrc/xh_radbt.h +include/wx-2.6/wx/xrc/xh_radbx.h +include/wx-2.6/wx/xrc/xh_scrol.h +include/wx-2.6/wx/xrc/xh_scwin.h +include/wx-2.6/wx/xrc/xh_sizer.h +include/wx-2.6/wx/xrc/xh_slidr.h +include/wx-2.6/wx/xrc/xh_spin.h +include/wx-2.6/wx/xrc/xh_split.h +include/wx-2.6/wx/xrc/xh_statbar.h +include/wx-2.6/wx/xrc/xh_stbmp.h +include/wx-2.6/wx/xrc/xh_stbox.h +include/wx-2.6/wx/xrc/xh_stlin.h +include/wx-2.6/wx/xrc/xh_sttxt.h +include/wx-2.6/wx/xrc/xh_text.h +include/wx-2.6/wx/xrc/xh_tglbtn.h +include/wx-2.6/wx/xrc/xh_toolb.h +include/wx-2.6/wx/xrc/xh_tree.h +include/wx-2.6/wx/xrc/xh_unkwn.h +include/wx-2.6/wx/xrc/xh_wizrd.h +include/wx-2.6/wx/xrc/xmlres.h +include/wx-2.6/wx/xti.h +include/wx-2.6/wx/xtistrm.h +include/wx-2.6/wx/xtixml.h +include/wx-2.6/wx/zipstrm.h +include/wx-2.6/wx/zstream.h +lib/libwx_base-2.6.so +lib/libwx_base_net-2.6.so +lib/libwx_base_xml-2.6.so +lib/libwx_gtk2_adv-2.6.so +lib/libwx_gtk2_core-2.6.so +lib/libwx_gtk2_gl-2.6.so +lib/libwx_gtk2_html-2.6.so +lib/libwx_gtk2_media-2.6.so +lib/libwx_gtk2_qa-2.6.so +lib/libwx_gtk2_xrc-2.6.so +lib/wx/config/gtk2-ansi-release-2.6 +lib/wx/include/gtk2-ansi-release-2.6/wx/setup.h share/aclocal/wxwin.m4 -share/doc/wx/gtk/LICENSE +share/doc/wxGTK/LICENSE +${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/wxstd.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/wxstd.mo +${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/wxstd.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/wxstd.mo -${PKGLOCALEDIR}/locale/zh/LC_MESSAGES/wxstd.mo -share/wx/2.4/afm/Cour.afm -share/wx/2.4/afm/CourBo.afm -share/wx/2.4/afm/CourBoO.afm -share/wx/2.4/afm/CourO.afm -share/wx/2.4/afm/Helv.afm -share/wx/2.4/afm/HelvBo.afm -share/wx/2.4/afm/HelvBoO.afm -share/wx/2.4/afm/HelvO.afm -share/wx/2.4/afm/TimesBo.afm -share/wx/2.4/afm/TimesBoO.afm -share/wx/2.4/afm/TimesO.afm -share/wx/2.4/afm/TimesRo.afm -share/wx/2.4/afm/Zapf.afm -share/wx/2.4/gs_afm/Cour.afm -share/wx/2.4/gs_afm/CourBo.afm -share/wx/2.4/gs_afm/CourBoO.afm -share/wx/2.4/gs_afm/CourO.afm -share/wx/2.4/gs_afm/Helv.afm -share/wx/2.4/gs_afm/HelvBo.afm -share/wx/2.4/gs_afm/HelvBoO.afm -share/wx/2.4/gs_afm/HelvO.afm -share/wx/2.4/gs_afm/TimesBo.afm -share/wx/2.4/gs_afm/TimesBoO.afm -share/wx/2.4/gs_afm/TimesO.afm -share/wx/2.4/gs_afm/TimesRo.afm -share/wx/2.4/gs_afm/Zapf.afm -@dirrm share/wx/2.4/gs_afm -@dirrm share/wx/2.4/afm -@dirrm share/wx/2.4 -@unexec ${RMDIR} %D/share/wx 2>/dev/null || ${TRUE} -@dirrm share/doc/wx/gtk -@dirrm share/doc/wx -@dirrm lib/wx/include/gtk${GTKVER}-2.4/wx -@dirrm lib/wx/include/gtk${GTKVER}-2.4 -@exec ${MKDIR} %D/lib/wx/include/univ -@unexec ${RMDIR} %D/lib/wx/include/univ 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/lib/wx/include 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/lib/wx 2>/dev/null || ${TRUE} -@dirrm include/wx/unix -@exec ${MKDIR} %D/include/wx/univ -@dirrm include/wx/univ -@dirrm include/wx/protocol -@dirrm include/wx/html -@dirrm include/wx/gtk -@dirrm include/wx/generic -@unexec ${RMDIR} %D/include/wx 2>/dev/null || ${TRUE} +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/wxstd.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/wxstd.mo +${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/wxstd.mo +@dirrm share/doc/wxGTK +@dirrm lib/wx/include/gtk2-ansi-release-2.6/wx +@dirrm lib/wx/include/gtk2-ansi-release-2.6 +@dirrm lib/wx/include +@dirrm lib/wx/config +@dirrm lib/wx +@dirrm include/wx-2.6/wx/xrc +@dirrm include/wx-2.6/wx/xml +@dirrm include/wx-2.6/wx/unix +@dirrm include/wx-2.6/wx/protocol +@dirrm include/wx-2.6/wx/html +@dirrm include/wx-2.6/wx/gtk/gnome +@dirrm include/wx-2.6/wx/gtk +@dirrm include/wx-2.6/wx/generic +@dirrm include/wx-2.6/wx +@dirrm include/wx-2.6 diff --git a/x11/wxGTK/buildlink3.mk b/x11/wxGTK/buildlink3.mk index 3e1d61db98a..f2a54f1b8be 100644 --- a/x11/wxGTK/buildlink3.mk +++ b/x11/wxGTK/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/12/28 23:18:19 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/08/07 11:26:17 wiz Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ WXGTK_BUILDLINK3_MK:= ${WXGTK_BUILDLINK3_MK}+ @@ -13,8 +13,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NwxGTK} BUILDLINK_PACKAGES+= wxGTK .if !empty(WXGTK_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.4.2 -BUILDLINK_RECOMMENDED.wxGTK+= wxGTK>=2.4.2nb3 +BUILDLINK_DEPENDS.wxGTK+= wxGTK>=2.6.0 BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK .endif # WXGTK_BUILDLINK3_MK @@ -23,11 +22,6 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" - -.if !empty(WXGTK_USE_GTK1:M[Yy][Ee][Ss]) -. include "../../x11/gtk/buildlink3.mk" -.else -. include "../../x11/gtk2/buildlink3.mk" -.endif +.include "../../x11/gtk2/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo index 5b9d7f6fb01..5b113331833 100644 --- a/x11/wxGTK/distinfo +++ b/x11/wxGTK/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.19 2005/07/24 21:14:51 wiz Exp $ +$NetBSD: distinfo,v 1.20 2005/08/07 11:26:17 wiz Exp $ -SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c -RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e -Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes -SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29 -SHA1 (patch-ab) = 55f61ebaa77aeea5bfe447b974a1f18e87917300 -SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4 -SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf -SHA1 (patch-ae) = 81c2e33fbdd4a715da5a14ef3ae0a377d0d9aec2 -SHA1 (patch-af) = 81cddc6dcdf986317f7d62f027515cae6ef2c855 -SHA1 (patch-ag) = ccdaca4030c08aefa922367019e0c9249b810456 -SHA1 (patch-ah) = 24cc32f7eda53f4704422363902f72239eda2253 +SHA1 (wxGTK-2.6.1.tar.bz2) = 49142a4b827a4c8187eb60c76c85355f50058e8e +RMD160 (wxGTK-2.6.1.tar.bz2) = 66f4a499b69dcffec7579472d238b637b986e7cd +Size (wxGTK-2.6.1.tar.bz2) = 7205374 bytes +SHA1 (patch-aa) = 884ab5b352119a37b2611e0538bf10914530a5d5 +SHA1 (patch-ab) = c7f91bffe1f5ac0a1d077f9625c61ad4c1c691bd +SHA1 (patch-ah) = c384584623b63004f59b4755ef32156f3d5687a0 diff --git a/x11/wxGTK/patches/patch-aa b/x11/wxGTK/patches/patch-aa index 1d13477179e..902a6725f6a 100644 --- a/x11/wxGTK/patches/patch-aa +++ b/x11/wxGTK/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2004/04/27 21:59:24 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.6 2005/08/07 11:26:17 wiz Exp $ ---- configure.orig Sun Sep 21 11:31:30 2003 +--- configure.orig 2005-06-02 18:03:05.000000000 +0200 +++ configure -@@ -11498,9 +11498,10 @@ SEARCH_INCLUDE="\ +@@ -22242,7 +22242,8 @@ SEARCH_INCLUDE="\ /usr/local/x11r5/include \ /usr/lpp/Xamples/include \ \ @@ -10,27 +10,5 @@ $NetBSD: patch-aa,v 1.5 2004/04/27 21:59:24 dmcmahill Exp $ + /usr/openwin/share/include\ + ${BUILDLINK_DIR}/include" --SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " -+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" + SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`" - - cat > confcache <<\EOF -@@ -16104,8 +16105,8 @@ esac - WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a" - WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a" - --WXCONFIG_LIBS="-l${WX_LIBRARY}" --WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a" -+WXCONFIG_LIBS="-l${WX_LIBRARY_BASENAME}" -+WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY_BASENAME}.a" - - if test "$wxUSE_OPENGL" = "yes"; then - WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}" -@@ -22777,6 +22778,7 @@ s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER - s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g - s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g - s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g -+s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g - s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g - s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g - s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab index 7fe5b3a32ce..52f7b237bbd 100644 --- a/x11/wxGTK/patches/patch-ab +++ b/x11/wxGTK/patches/patch-ab @@ -1,371 +1,32 @@ -$NetBSD: patch-ab,v 1.11 2004/05/19 15:16:39 drochner Exp $ +$NetBSD: patch-ab,v 1.12 2005/08/07 11:26:17 wiz Exp $ ---- Makefile.in.orig 2003-09-21 13:31:27.000000000 +0200 -+++ Makefile.in 2004-01-10 10:30:56.000000000 +0100 -@@ -21,13 +21,13 @@ - .SUFFIXES: .o .c .cpp .cxx .rsrc .r - - .c.o: -- $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) -o $@ $< - - .cpp.o: -- $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $< - - .cxx.o: -- $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $< - - .rsrc.r: - $(DEREZ) $^ Carbon.r -useDF > $@ -@@ -42,10 +42,6 @@ - VP3 = @top_srcdir@/src/generic - VP4 = @top_srcdir@/src/unix - VP5 = @top_srcdir@/src/html --VP6 = @top_srcdir@/src/png --VP7 = @top_srcdir@/src/jpeg --VP8 = @top_srcdir@/src/tiff --VP9 = @top_srcdir@/src/zlib - VPA = @top_srcdir@/src/regex - VP10 = @top_srcdir@/src/iodbc - VP11 = @top_srcdir@/src/msw/ole -@@ -53,7 +49,7 @@ - # the comment at the end of the next line is needed because otherwise autoconf - # would remove this line completely - it contains a built-in hack to remove - # any VPATH assignment not containing ':' --VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf -+VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11) # ':' for autoconf - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -72,7 +68,8 @@ - INSTALL = @INSTALL@ +--- Makefile.in.orig 2005-06-02 18:03:05.000000000 +0200 ++++ Makefile.in +@@ -23,7 +23,9 @@ PIC_FLAG = @PIC_FLAG@ + SONAME_FLAG = @SONAME_FLAG@ + STRIP = @STRIP@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ --INSTALL_SCRIPT = @INSTALL@ -+INSTALL_DATA_DIR = ${BSD_INSTALL_DATA_DIR} +INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - build_alias = @build_alias@ - build_triplet = @build@ -@@ -94,10 +91,6 @@ - COMMDIR = $(WXDIR)/src/common - HTMLDIR = $(WXDIR)/src/html - UNIXDIR = $(WXDIR)/src/unix --PNGDIR = $(WXDIR)/src/png --JPEGDIR = $(WXDIR)/src/jpeg --TIFFDIR = $(WXDIR)/src/tiff --ZLIBDIR = $(WXDIR)/src/zlib - REGEXDIR = $(WXDIR)/src/regex - GTKDIR = $(WXDIR)/src/gtk - X11DIR = $(WXDIR)/src/x11 -@@ -161,124 +154,6 @@ - regerror.o \ - regfree.o - --ZLIBOBJS = \ -- adler32.o \ -- compress.o \ -- crc32.o \ -- gzio.o \ -- uncompr.o \ -- deflate.o \ -- trees.o \ -- zutil.o \ -- inflate.o \ -- infblock.o \ -- inftrees.o \ -- infcodes.o \ -- infutil.o \ -- inffast.o -- --PNGOBJS = \ -- png.o \ -- pngerror.o \ -- pnggccrd.o \ -- pngget.o \ -- pngmem.o \ -- pngpread.o \ -- pngread.o \ -- pngrio.o \ -- pngrtran.o \ -- pngrutil.o \ -- pngset.o \ -- pngtrans.o \ -- pngvcrd.o \ -- pngwio.o \ -- pngwrite.o \ -- pngwtran.o \ -- pngwutil.o -- --JPEGOBJS = \ -- jcomapi.o \ -- jutils.o \ -- jerror.o \ -- jmemmgr.o \ -- jmemnobs.o \ -- jcapimin.o \ -- jcapistd.o \ -- jctrans.o \ -- jcparam.o \ -- jdatadst.o \ -- jcinit.o \ -- jcmaster.o \ -- jcmarker.o \ -- jcmainct.o \ -- jcprepct.o \ -- jccoefct.o \ -- jccolor.o \ -- jcsample.o \ -- jchuff.o \ -- jcphuff.o \ -- jcdctmgr.o \ -- jfdctfst.o \ -- jfdctflt.o \ -- jfdctint.o \ -- jdapimin.o \ -- jdapistd.o \ -- jdtrans.o \ -- jdatasrc.o \ -- jdmaster.o \ -- jdinput.o \ -- jdmarker.o \ -- jdhuff.o \ -- jdphuff.o \ -- jdmainct.o \ -- jdcoefct.o \ -- jdpostct.o \ -- jddctmgr.o \ -- jidctfst.o \ -- jidctflt.o \ -- jidctint.o \ -- jidctred.o \ -- jdsample.o \ -- jdcolor.o \ -- jquant1.o \ -- jquant2.o \ -- jdmerge.o -- --TIFFOBJS = \ -- tif_aux.o \ -- tif_close.o \ -- tif_codec.o \ -- tif_compress.o \ -- tif_dir.o \ -- tif_dirinfo.o \ -- tif_dirread.o \ -- tif_dirwrite.o \ -- tif_dumpmode.o \ -- tif_error.o \ -- tif_fax3.o \ -- tif_fax3sm.o \ -- tif_getimage.o \ -- tif_jpeg.o \ -- tif_flush.o \ -- tif_lzw.o \ -- tif_luv.o \ -- tif_next.o \ -- tif_open.o \ -- tif_packbits.o \ -- tif_pixarlog.o \ -- tif_predict.o \ -- tif_print.o \ -- tif_read.o \ -- tif_swab.o \ -- tif_strip.o \ -- tif_thunder.o \ -- tif_tile.o \ -- tif_unix.o \ -- tif_version.o \ -- tif_warning.o \ -- tif_write.o \ -- tif_zip.o -- - IODBCOBJS = \ - catalog.o \ - connect.o \ -@@ -302,52 +177,27 @@ - SONAME_FLAGS = @SONAME_FLAGS@ - SONAME_FLAGS_GL = @SONAME_FLAGS_GL@ - --all: @WX_ALL@ -+all: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(build_libdir)/lib@WX_LIBRARY_GL@.la - --$(build_libdir)/@WX_LIBRARY_NAME_STATIC@: $(OBJECTS) -- @$(INSTALL) -d $(build_libdir) -- @$(RM) $@ -- $(AR) $(AROPTIONS) $@ $(OBJECTS) -- $(RANLIB) $@ -- --$(build_libdir)/@WX_LIBRARY_NAME_STATIC_GL@: glcanvas.o -- @$(INSTALL) -d $(build_libdir) -- @$(RM) $@ -- $(AR) $(AROPTIONS) $@ glcanvas.o -- $(RANLIB) $@ -- --$(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS) -- @$(INSTALL) -d $(build_libdir) -- $(SHARED_LD) $@ $(SONAME_FLAGS) $(OBJECTS) $(EXTRALIBS) -+$(build_libdir)/lib@WX_LIBRARY_BASENAME@.la: $(OBJECTS) -+ @$(INSTALL_DATA_DIR) $(build_libdir) -+ ${LIBTOOL} --mode=link ${CXX} -o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la ${OBJECTS:.o=.lo} ${EXTRALIBS} -rpath ${PREFIX}/lib -version-info 0:1 - - # NB: we used to have "-L$(build_libdir) @WXCONFIG_LIBS@" in the SHARED_LD line - # but this seems to result in problems with libwx_gtk being linked in twice --$(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ -- @$(INSTALL) -d $(build_libdir) -- $(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS) -+$(build_libdir)/lib@WX_LIBRARY_GL@.la: glcanvas.o $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la -+ @$(INSTALL_DATA_DIR) $(build_libdir) -+ ${LIBTOOL} --mode=link ${CXX} -o $(build_libdir)/lib@WX_LIBRARY_GL@.la glcanvas.lo ${EXTRALIBS} $(LDFLAGS_GL) $(OPENGLLIBS) -rpath ${PREFIX}/lib -version-info 0:1 - - $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES) -- @$(INSTALL) -d $(build_libdir) -+ @$(INSTALL_DATA_DIR) $(build_libdir) - $(RESCOMP) -d __UNIX__ -useDF $^ -o $@ - --$(build_libdir)/@WX_LIBRARY_LINK1@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2@ -- cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ -- --$(build_libdir)/@WX_LIBRARY_LINK1_GL@: $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK1_GL@ -- @$(RM) $(build_libdir)/@WX_LIBRARY_LINK2_GL@ -- cd $(build_libdir) \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \ -- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ -- - $(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h - - parser.o: parser.c lexer.c - $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c -+ ${LIBTOOL} --mode=compile $(CCLEX) -c $(CFLAGS) -I. $(PICFLAGS) -o $@ parser.c - - parser.c: $(COMMDIR)/parser.y lexer.c - $(YACC) $(COMMDIR)/parser.y -@@ -369,13 +219,6 @@ - - @IF_GNU_MAKE@-include $(OBJECTS:.o=.d) - --CREATE_INSTALLED_LINKS: preinstall -- $(RM) $(libdir)/@WX_LIBRARY_LINK1@ -- $(RM) $(libdir)/@WX_LIBRARY_LINK2@ -- cd $(libdir) \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \ -- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ -- - CREATE_INSTALLED_LINKS_GL: preinstall_gl - $(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@ - $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@ -@@ -385,10 +228,10 @@ - - afminstall: preinstall - @if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi -- $(INSTALL) -d $(datadir)/wx -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN) -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/afm -- $(INSTALL) -d $(datadir)/wx/$(VER_MAJMIN)/gs_afm -+ $(INSTALL_DATA_DIR) $(datadir)/wx -+ $(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN) -+ $(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN)/afm -+ $(INSTALL_DATA_DIR) $(datadir)/wx/$(VER_MAJMIN)/gs_afm - $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/afm - $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/$(VER_MAJMIN)/gs_afm - -@@ -410,51 +253,51 @@ - - # this is the real install target: copies the library, wx-config and the - # headers to the installation directory --preinstall: $(build_libdir)/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLCHAIN_NAME@-config -+preinstall: $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(top_builddir)/wx@TOOLCHAIN_NAME@-config - @echo " " - @echo " Installing wxWindows..." - @echo " " - -- @if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi -- @if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi -- @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi -+ @if test ! -d $(prefix); then $(INSTALL_DATA_DIR) $(prefix); fi -+ @if test ! -d $(bindir); then $(INSTALL_DATA_DIR) $(bindir); fi -+ @if test ! -d $(libdir); then $(INSTALL_DATA_DIR) $(libdir); fi - - $(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config - cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config -- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@ -+ ${LIBTOOL} --mode=install ${INSTALL_DATA} $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(libdir) - @if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \ - $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi - -- $(INSTALL) -d $(libdir)/wx -- $(INSTALL) -d $(libdir)/wx/include -- $(INSTALL) -d $(libdir)/wx/include/univ -- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@ -- $(INSTALL) -d $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx -+ $(INSTALL_DATA_DIR) $(libdir)/wx -+ $(INSTALL_DATA_DIR) $(libdir)/wx/include -+ $(INSTALL_DATA_DIR) $(libdir)/wx/include/univ -+ $(INSTALL_DATA_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@ -+ $(INSTALL_DATA_DIR) $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx - $(INSTALL_DATA) $(build_libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h \ - $(libdir)/wx/include/@TOOLCHAIN_NAME@/wx/setup.h - -- $(INSTALL) -d $(includedir)/wx -+ $(INSTALL_DATA_DIR) $(includedir)/wx - @# FIXME: This will erroneously install a wx/base dir for wxBase.. -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/@TOOLKIT_DIR@; fi -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/html; fi -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/generic; fi -- @if test "$(USE_GUI)" = 1; then $(INSTALL) -d $(includedir)/wx/univ; fi -- @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL) -d $(includedir)/wx/msw/ole; fi -+ @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/@TOOLKIT_DIR@; fi -+ @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/html; fi -+ @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/generic; fi -+ @if test "$(USE_GUI)" = 1; then $(INSTALL_DATA_DIR) $(includedir)/wx/univ; fi -+ @if test "@TOOLKIT_DIR@" = "msw"; then $(INSTALL_DATA_DIR) $(includedir)/wx/msw/ole; fi - - @# always install msw headers for wxBase, it's much simpler -- @if test "$(USE_GUI)" = 0; then $(INSTALL) -d $(includedir)/wx/msw; fi -+ @if test "$(USE_GUI)" = 0; then $(INSTALL_DATA_DIR) $(includedir)/wx/msw; fi - -- $(INSTALL) -d $(includedir)/wx/protocol -- $(INSTALL) -d $(includedir)/wx/unix -+ $(INSTALL_DATA_DIR) $(includedir)/wx/protocol -+ $(INSTALL_DATA_DIR) $(includedir)/wx/unix - @list='$(HEADERS)'; for p in $$list; do \ - $(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p; \ - echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \ - done - -- @if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi -+ @if test ! -d $(localedir); then $(INSTALL_DATA_DIR) $(localedir); fi - @for p in $(WX_LINGUAS); do \ -- if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\ -- if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\ -+ if test ! -d $(localedir)/$$p; then $(INSTALL_DATA_DIR) $(localedir)/$$p; fi;\ -+ if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL_DATA_DIR) $(localedir)/$$p/LC_MESSAGES; fi;\ - $(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \ - echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \ - done -@@ -467,14 +310,14 @@ - $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_ASCII@ $(libdir)/@WX_RESOURCES_MACOSX_ASCII@ - $(INSTALL_PROGRAM) $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@ $(libdir)/@WX_RESOURCES_MACOSX_DATA@ - --preinstall_gl: $(build_libdir)/@WX_TARGET_LIBRARY_GL@ -+preinstall_gl: $(build_libdir)/lib@WX_LIBRARY_GL@.la - @echo " " - @echo " Installing wxWindows OpenGl add-on..." - @echo " " -- @if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi -- @INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@ -+ @if test ! -d $(libdir); then $(INSTALL_DATA_DIR) $(libdir); fi -+ ${LIBTOOL} --mode=install ${INSTALL_DATA} $(build_libdir)/lib@WX_LIBRARY_GL@.la $(libdir) - --install: @AFMINSTALL@ @WX_ALL_INSTALLED@ m4datainstall @WIN32INSTALL@ -+install: @AFMINSTALL@ preinstall_gl m4datainstall @WIN32INSTALL@ - @echo " " - @echo " The installation of wxWindows is finished. On certain" - @echo " platforms (e.g. Linux) you'll now have to run ldconfig" + INSTALL_DATA = @INSTALL_DATA@ ++INSTALL_DATA_DIR = @INSTALL_DATA_DIR@ + INSTALL_DIR = @INSTALL_DIR@ + srcdir = @srcdir@ + top_srcdir = @top_srcdir@ +@@ -1180,7 +1182,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr + @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC) + @COND_DEPS_TRACKING_0@CXXC = $(CXX) + @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) +-@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) ++@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) $(LIBOSSAUDIO) + @COND_USE_GUI_0@PORTNAME = base + @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) + @COND_TOOLKIT_MAC@WXBASEPORT = _carbon +@@ -9673,7 +9675,7 @@ samples: + install-wxconfig: + $(INSTALL_DIR) $(DESTDIR)$(bindir) + $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config +- $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config ++ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config + (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) + + locale_install: diff --git a/x11/wxGTK/patches/patch-ac b/x11/wxGTK/patches/patch-ac deleted file mode 100644 index 214d07b55f6..00000000000 --- a/x11/wxGTK/patches/patch-ac +++ /dev/null @@ -1,79 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2005/07/24 21:14:51 wiz Exp $ - ---- src/makelib.env.in.orig 2003-09-21 13:31:38.000000000 +0200 -+++ src/makelib.env.in -@@ -33,6 +33,7 @@ libdir = @libdir@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_DATA = @INSTALL_DATA_DIR@ - - TARGETLIB_STATIC = $(TARGET_LIBNAME).a - TARGETLIB_SHARED = $(TARGET_LIBNAME).so.$(LIBVERSION_CURRENT).$(LIBVERSION_REVISION).$(LIBVERSION_AGE) -@@ -47,13 +48,13 @@ LDFLAGS_VERSIONING = @LDFLAGS_VERSIONING - .SUFFIXES: .o .c .cpp .cxx - - .c.o: -- $(CC) -c $(CFLAGS) $(PICFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) -o $@ $< - - .cpp.o: -- $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $< - - .cxx.o: -- $(CXX) -c $(CXXFLAGS) $(PICFLAGS) -o $@ $< -+ ${LIBTOOL} --mode=compile $(CC) -c $(CXXFLAGS) $(CPPFLAGS) -o $@ $< - - # the comment at the end of the next line is needed because otherwise autoconf - # would remove this line completely - it contains a built-in hack to remove -@@ -62,40 +63,21 @@ VPATH = @PATH_IFS@$(top_srcdir)/$(libsrc - - include $(top_builddir)/src/make.env - --all: libtype_@WX_TARGET_LIBRARY_TYPE@ -+all: $(TARGET_LIBNAME).la - --libtype_so: $(top_builddir)/lib/$(TARGETLIB_SHARED) -- --libtype_a: $(top_builddir)/lib/$(TARGETLIB_STATIC) -- --$(top_builddir)/lib/$(TARGETLIB_SHARED): $(OBJECTS) -- @$(INSTALL) -d $(top_builddir)/lib -- $(SHARED_LD) $@ $(TARGETLIB_SONAME) $(OBJECTS) $(LDFLAGS_VERSIONING) -- cd $(top_builddir)/lib \ -- && $(RM) $(TARGETLIB_LINK1) $(TARGETLIB_LINK2) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -- --$(top_builddir)/lib/$(TARGETLIB_STATIC): $(OBJECTS) -- @$(INSTALL) -d $(top_builddir)/lib -+$(TARGET_LIBNAME).la: $(OBJECTS) -+ @$(INSTALL_DATA_DIR) $(top_builddir)/lib - @$(RM) $@ -- $(AR) $(AROPTIONS) $@ $(OBJECTS) -- $(RANLIB) $@ -- --install: install_@WX_TARGET_LIBRARY_TYPE@ install_headers -+ ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJECTS:.o=.lo} \ -+ -rpath ${PREFIX}/lib -version-info 0:1 - --install_so: -- $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_SHARED) $(libdir)/$(TARGETLIB_SHARED) -- @$(RM) $(libdir)/$(TARGETLIB_LINK1) $(libdir)/$(TARGETLIB_LINK2) -- cd $(libdir) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK1) \ -- && $(LN_S) $(TARGETLIB_SHARED) $(TARGETLIB_LINK2) -+install: install_lib install_headers - --install_a: -- $(INSTALL_PROGRAM) $(top_builddir)/lib/$(TARGETLIB_STATIC) $(libdir)/$(TARGETLIB_STATIC) -+install_lib: -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} ${TARGET_LIBNAME}.la ${PREFIX}/lib - - install_headers: -- $(INSTALL) -d $(includedir)/wx/$(HEADER_SUBDIR) -+ $(INSTALL_DATA_DIR) $(includedir)/wx/$(HEADER_SUBDIR) - @for h in $(HEADERS); do \ - $(INSTALL_DATA) $(HEADER_PATH)/$(HEADER_SUBDIR)/$$h $(includedir)/wx/$(HEADER_SUBDIR)/$$h; \ - echo "installing $(includedir)/wx/$(HEADER_SUBDIR)/$$h"; \ diff --git a/x11/wxGTK/patches/patch-ad b/x11/wxGTK/patches/patch-ad deleted file mode 100644 index ce0063f7036..00000000000 --- a/x11/wxGTK/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.3 2004/01/10 14:23:52 recht Exp $ - ---- wx-config.in.orig 2003-09-21 13:31:27.000000000 +0200 -+++ wx-config.in 2003-09-25 00:31:44.000000000 +0200 -@@ -147,7 +147,7 @@ - if test $static_flag = yes ; then - echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@" - else -- echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ -+ echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @LIBS@ @DMALLOC_LIBS@ - fi - - ;; diff --git a/x11/wxGTK/patches/patch-ae b/x11/wxGTK/patches/patch-ae deleted file mode 100644 index c1e0800c0b5..00000000000 --- a/x11/wxGTK/patches/patch-ae +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2005/06/16 13:02:57 hira Exp $ - ---- src/gtk/dcclient.cpp.orig 2003-09-21 13:31:57.000000000 +0200 -+++ src/gtk/dcclient.cpp 2005-01-02 14:11:00.000000000 +0100 -@@ -1666,8 +1666,10 @@ - if (height) (*height) = (wxCoord) h; - if (descent) - { -- // Do something about metrics here. TODO. -- (*descent) = 0; -+ PangoLayoutIter *iter = pango_layout_get_iter(layout); -+ int baseline = pango_layout_iter_get_baseline(iter); -+ pango_layout_iter_free(iter); -+ *descent = h - PANGO_PIXELS(baseline); - } - if (externalLeading) (*externalLeading) = 0; // ?? - diff --git a/x11/wxGTK/patches/patch-af b/x11/wxGTK/patches/patch-af deleted file mode 100644 index 0276d107e77..00000000000 --- a/x11/wxGTK/patches/patch-af +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-af,v 1.4 2005/06/16 13:02:57 hira Exp $ - ---- src/gtk/window.cpp.orig 2003-09-21 13:31:58.000000000 +0200 -+++ src/gtk/window.cpp 2005-01-02 14:11:08.000000000 +0100 -@@ -3448,8 +3448,10 @@ - if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE); - if (descent) - { -- // Do something about metrics here -- (*descent) = 0; -+ PangoLayoutIter *iter = pango_layout_get_iter(layout); -+ int baseline = pango_layout_iter_get_baseline(iter); -+ pango_layout_iter_free(iter); -+ *descent = *y - PANGO_PIXELS(baseline); - } - if (externalLeading) (*externalLeading) = 0; // ?? - diff --git a/x11/wxGTK/patches/patch-ag b/x11/wxGTK/patches/patch-ag deleted file mode 100644 index 8e8b70052a0..00000000000 --- a/x11/wxGTK/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.1 2005/06/11 17:17:56 wiz Exp $ - ---- wxwin.m4.orig 2003-09-21 13:31:27.000000000 +0200 -+++ wxwin.m4 -@@ -33,7 +33,7 @@ dnl adds support for --wx-prefix, --wx-e - dnl command line options - dnl --------------------------------------------------------------------------- - --AC_DEFUN(AM_OPTIONS_WXCONFIG, -+AC_DEFUN([AM_OPTIONS_WXCONFIG], - [ - AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)], - wx_config_prefix="$withval", wx_config_prefix="") -@@ -56,7 +56,7 @@ dnl ------------------------------------ - dnl - dnl Get the cflags and libraries from the wx-config script - dnl --AC_DEFUN(AM_PATH_WXCONFIG, -+AC_DEFUN([AM_PATH_WXCONFIG], - [ - dnl do we have wx-config name: it can be wx-config or wxd-config or ... - if test x${WX_CONFIG_NAME+set} != xset ; then diff --git a/x11/wxGTK/patches/patch-ah b/x11/wxGTK/patches/patch-ah index 05ddb9bfe7d..0cc8eb4542d 100644 --- a/x11/wxGTK/patches/patch-ah +++ b/x11/wxGTK/patches/patch-ah @@ -1,9 +1,9 @@ -$NetBSD: patch-ah,v 1.1 2005/07/24 21:14:51 wiz Exp $ +$NetBSD: patch-ah,v 1.2 2005/08/07 11:26:17 wiz Exp $ ---- contrib/src/Makefile.in.orig Sun Sep 21 13:32:39 2003 -+++ contrib/src/Makefile.in +--- contrib/src/Makefile.in.orig 2005-06-02 18:03:59.000000000 +0200 ++++ contrib/src/Makefile.in 2005-07-28 17:32:22.000000000 +0200 @@ -2,3 +2,3 @@ --CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate #applet -+CONTRIB_SUBDIRS=canvas fl gizmos net ogl plot stc svg xrc #applet +-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg deprecated animate #applet ++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg deprecated #applet |