X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fplat%2FX11.cc;h=680fb1e66d48c763704086e43d52d122b204404e;hp=53e20dee7aaf4b134b2178e21bdca3dc8d82a2c3;hb=a41252ba1e0f5dd90100aa2064c011268809c038;hpb=a6c4f7b784acf2269c33188982b0d479cc11a0f4 diff --git a/src/org/ibex/plat/X11.cc b/src/org/ibex/plat/X11.cc index 53e20de..680fb1e 100644 --- a/src/org/ibex/plat/X11.cc +++ b/src/org/ibex/plat/X11.cc @@ -747,7 +747,6 @@ void org::ibex::plat::X11::natInit() { // FIXME: don't know why (True, False) is the best solution... if(XmuLookupStandardColormap(display, screen_num, visual->visualid, colorDepth, XA_RGB_BEST_MAP, True, False) == 0) org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed")); - XStandardColormap* best_map_info = NULL; int count; if (XGetRGBColormaps(display, RootWindow(display, screen_num), &best_map_info, &count, XA_RGB_BEST_MAP) == 0) @@ -769,9 +768,8 @@ void org::ibex::plat::X11::natInit() { org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf)); } -//#include "WINGs/WINGs.h" +#include "WINGs/WINGs.h" jstring org::ibex::plat::X11::_fileDialog(jstring suggestedFileName, jboolean write) { -#ifdef asfasdfasf int argc = 1; char* argv[2]; argv[0] = "Ibex"; @@ -794,11 +792,9 @@ jstring org::ibex::plat::X11::_fileDialog(jstring suggestedFileName, jboolean wr if (WMRunModalFilePanelForDirectory(oPanel, NULL, buf, /*title*/ NULL, NULL) != True) return NULL; return JvNewStringLatin1(WMGetFilePanelFileName(oPanel)); } -#endif return NULL; } - ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -2334,3 +2330,4 @@ XmuDeleteStandardColormap(Display *dpy, int screen, Atom property) } } +