From c0854a089c74a9cc72f9dd3058a49decf74ac448 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Wed, 11 Aug 1999 13:36:47 +0000 Subject: [PATCH] Corrected Motif build, Updated testconf git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 12 ++++++++---- src/motif/Makefile.am | 1 + src/motif/frame.cpp | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/configure.in b/configure.in index 49a63f738a..3c48c7ebb8 100644 --- a/configure.in +++ b/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 diff --git a/src/motif/Makefile.am b/src/motif/Makefile.am index 0cdd387cf9..1ab35e134a 100644 --- a/src/motif/Makefile.am +++ b/src/motif/Makefile.am @@ -97,6 +97,7 @@ libwx_motif_la_SOURCES = \ sckipc.cpp \ sckstrm.cpp \ serbase.cpp \ + sizer.cpp \ socket.cpp \ stream.cpp \ tbarbase.cpp \ diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp index c18c7de83f..a5272571d0 100644 --- a/src/motif/frame.cpp +++ b/src/motif/frame.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 -- 2.45.2