Corrected Motif build,
Updated testconf git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
92afa2b150
commit
c0854a089c
12
configure.in
12
configure.in
@ -891,10 +891,6 @@ dnl disable static libs by default, this takes too much time...
|
||||
dnl libtool doesn't work on anything but Linux and maybe
|
||||
dnl ***BSD
|
||||
|
||||
SHLIB_LINKER=
|
||||
SHLIB_LINKER_FLAG=
|
||||
SHLIB_CFLAG=
|
||||
|
||||
case "${host}" in
|
||||
*-hp-hpux* )
|
||||
AM_DISABLE_SHARED
|
||||
@ -941,6 +937,14 @@ esac
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl things for shared libraries without libtool
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
SHARED_LINKER=gcc -shared
|
||||
SHARED_LINKER_FLAG=
|
||||
SHARED_CFLAG=
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Define search path for includes and libraries: all headers and libs will be
|
||||
dnl looked for in all directories of this path
|
||||
|
@ -97,6 +97,7 @@ libwx_motif_la_SOURCES = \
|
||||
sckipc.cpp \
|
||||
sckstrm.cpp \
|
||||
serbase.cpp \
|
||||
sizer.cpp \
|
||||
socket.cpp \
|
||||
stream.cpp \
|
||||
tbarbase.cpp \
|
||||
|
@ -64,7 +64,7 @@ extern wxList wxPendingDelete;
|
||||
static bool wxTopLevelUsed = FALSE;
|
||||
|
||||
#if !USE_SHARED_LIBRARY
|
||||
BEGIN_EVENT_TABLE(wxFrame, wxWindowBase)
|
||||
BEGIN_EVENT_TABLE(wxFrame, wxWindow)
|
||||
EVT_SIZE(wxFrame::OnSize)
|
||||
EVT_ACTIVATE(wxFrame::OnActivate)
|
||||
EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
|
||||
@ -73,7 +73,7 @@ BEGIN_EVENT_TABLE(wxFrame, wxWindowBase)
|
||||
EVT_CLOSE(wxFrame::OnCloseWindow)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindowBase)
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
|
||||
#endif
|
||||
|
||||
#if wxUSE_NATIVE_STATUSBAR
|
||||
|
Loading…
Reference in New Issue
Block a user