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
This commit is contained in:
parent
4ac1ab8836
commit
af6c301b95
1
utils/ogl/samples/studio/Makefile
Normal file
1
utils/ogl/samples/studio/Makefile
Normal file
@ -0,0 +1 @@
|
||||
include ../../../../setup/general/makedirs
|
35
utils/ogl/samples/studio/Makefile.in
Normal file
35
utils/ogl/samples/studio/Makefile.in
Normal file
@ -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
|
@ -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 */
|
||||
" ",
|
||||
" @@@@@ ",
|
||||
" @#+#+#@ ",
|
||||
" @#+#+#+#@@@@@@ ",
|
||||
" @$$$$$$$$$$$$@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @$+#+#+#+#+#+@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @$+#+#+#+#+#+@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @$+#+#+#+#+#+@.",
|
||||
" @$#+#+#+#+#+#@.",
|
||||
" @@@@@@@@@@@@@@.",
|
||||
" ..............",
|
||||
" ",
|
||||
" "};
|
||||
|
@ -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)
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user