Corrected Motif build,

  Updated testconf

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 49a63f738a430dd23ea41c03cf798141f959caf7..3c48c7ebb8a88b65a7fa2651649a291f31756330 100644 (file)
--- 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 0cdd387cf90e6dd30dcfc75cb579d81a7f526096..1ab35e134a9f733af9efd2b9f6255cc981a679da 100644 (file)
--- 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 c18c7de83f97b1d366ceb27133fba229cc41c101..a5272571d00aa641282412b915f2bb1db1ad9c9d 100644 (file)
--- 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