added Makefile[.in] for build using wxGTK method. Note that wxGTK's createall

script doesn't yet look this deep, so it's not very usefull now...

also fixed some wxGTK compile problems.

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

diff --git a/utils/ogl/samples/studio/Makefile b/utils/ogl/samples/studio/Makefile
new file mode 100644 (file)
index 0000000..2b68dc5
--- /dev/null
+++ b/utils/ogl/samples/studio/Makefile
@@ -0,0 +1 @@
+include ../../../../setup/general/makedirs

diff --git a/utils/ogl/samples/studio/Makefile.in b/utils/ogl/samples/studio/Makefile.in
new file mode 100644 (file)
index 0000000..58ce5bd
--- /dev/null
+++ b/utils/ogl/samples/studio/Makefile.in
@@ -0,0 +1,35 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a binary only
+RULE=bin
+
+# define exexutable name
+BIN_TARGET=studio
+# define binary sources
+BIN_CPP_SRC=\
+  cspalette.cpp\
+  csprint.cpp\
+  dialogs.cpp\
+  doc.cpp\
+  mainfrm.cpp\
+  project.cpp\
+  shapes.cpp\
+  studio.cpp\
+  symbols.cpp\
+  view.cpp
+       
+#define binary objects
+BIN_OBJ=\
+ $(BIN_CPP_SRC:.cpp=.o)
+
+# additional things needed to link
+BIN_LINK=-lwx_ogl_gtk
+
+# additional things needed to compile
+ADD_COMPILE=-I$(WXBASEDIR)/utils/ogl/src -I../bitmaps
+
+# include the definitions now
+include ../../../../../template.mak

diff --git a/utils/ogl/samples/studio/bitmaps/folder.xpm b/utils/ogl/samples/studio/bitmaps/folder.xpm
deleted file mode 100644 (file)
index fdabbfb..0000000
--- a/utils/ogl/samples/studio/bitmaps/folder.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * folder_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"       s None  c None",
-".      c #000000",
-"+      c #c0c0c0",
-"@      c #808080",
-"#      c #ffff00",
-"$      c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};
-

diff --git a/utils/ogl/samples/studio/mainfrm.cpp b/utils/ogl/samples/studio/mainfrm.cpp
index 0364cdbd4facf7c8fb11a27d015cc82ea338f94e..e681b8c5be15ff2b1e1e7076f8ce5da6645ec7aa 100644 (file)
--- a/utils/ogl/samples/studio/mainfrm.cpp
+++ b/utils/ogl/samples/studio/mainfrm.cpp
@@ -150,8 +150,10 @@ void csFrame::OnSize(wxSizeEvent& event)
 // Make sure the correct toolbars are showing for the active view
 void csFrame::OnIdle(wxIdleEvent& event)
 {
-    wxFrame::OnIdle(event);
-
+/* HH: gtk's wxFrame nor wxWindow have an OnIdle method. Is this a bug? */
+#ifndef __WXGTK__    
+    wxDocMDIParentFrame::OnIdle(event);
+#endif
     wxSashLayoutWindow* paletteWin = wxGetApp().GetDiagramPaletteSashWindow();
     wxSashLayoutWindow* diagramToolBarWin = wxGetApp().GetDiagramToolBarSashWindow();
     if (!paletteWin || !diagramToolBarWin)

diff --git a/utils/ogl/samples/studio/studio.cpp b/utils/ogl/samples/studio/studio.cpp
index 0fce92efe8facdc0580369eee58b8340133d7e9d..87556d57cc0354fa318a3368b267fabb8bc7f944 100644 (file)
--- a/utils/ogl/samples/studio/studio.cpp
+++ b/utils/ogl/samples/studio/studio.cpp
@@ -25,10 +25,6 @@
 #include "wx/config.h"
 #include "wx/laywin.h"
 
-#ifdef __WXGTK__
-#include "folder.xpm"
-#endif
-
 #include "studio.h"
 #include "view.h"
 #include "doc.h"