Compilation fixes for Nano-X

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 9d45e90a6d90aec068b3028b8f613963e186713f..e40d31131d31e932322894c7a1b13ffec75c03ea 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -411,6 +411,7 @@ int wxApp::MainLoop()
     return rt;
 }
 
+#if !wxUSE_NANOX
 //-----------------------------------------------------------------------
 // X11 predicate function for exposure compression
 //-----------------------------------------------------------------------
@@ -442,6 +443,8 @@ static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
     
     return TRUE;
 }
+#endif
+    // wxUSE_NANOX
 
 //-----------------------------------------------------------------------
 // Processes an X event.

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index 0e57fb9ba29c8b4e5ff88573c6b418f5963740dc..e315f5a4ccae5504d9f1a95f75e64ce5f6c449c0 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -26,8 +26,10 @@
 // data
 //-----------------------------------------------------------------------------
 
+#if !wxUSE_NANOX
 Atom  g_clipboardAtom   = 0;
 Atom  g_targetsAtom     = 0;
+#endif
 
 // the trace mask we use with wxLogTrace() - call
 // wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
@@ -290,10 +292,11 @@ wxClipboard::wxClipboard()
     /* we use m_targetsWidget to query what formats are available */
 
     /* we use m_clipboardWidget to get and to offer data */
-
+#if !wxUSE_NANOX
     if (!g_clipboardAtom) g_clipboardAtom = XInternAtom( (Display*) wxGetDisplay(), "CLIPBOARD", False );
     if (!g_targetsAtom) g_targetsAtom = XInternAtom( (Display*) wxGetDisplay(), "TARGETS", False );
-
+#endif
+    
     m_formatSupported = FALSE;
     m_targetRequested = 0;
 
@@ -377,6 +380,9 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
+#if wxUSE_NANOX
+    return FALSE;
+#else
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
@@ -440,6 +446,7 @@ bool wxClipboard::AddData( wxDataObject *data )
 #endif
 
     return res;
+#endif
 }
 
 void wxClipboard::Close()

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index 75028159fe61d74a5aeffaa20fecd956f4147f2c..c3730280895b95324d169a3ab9938408457df91a 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -97,11 +97,15 @@ wxDataFormatId wxDataFormat::GetType() const
 
 wxString wxDataFormat::GetId() const
 {
+#if wxUSE_NANOX
+    return wxEmptyString;
+#else
     char *t = XGetAtomName ((Display*) wxGetDisplay(), m_format);
     wxString ret( t );  // this will convert from ascii to Unicode
     if (t) 
         XFree( t );
     return ret;
+#endif
 }
 
 void wxDataFormat::SetId( NativeFormat format )
@@ -123,20 +127,24 @@ void wxDataFormat::SetId( NativeFormat format )
 
 void wxDataFormat::SetId( const wxChar *id )
 {
+#if !wxUSE_NANOX
     PrepareFormats();
     m_type = wxDF_PRIVATE;
     wxString tmp( id );
     m_format = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST tmp.mbc_str(), FALSE );  // what is the string cast for?
+#endif
 }
 
 void wxDataFormat::PrepareFormats()
 {
+#if !wxUSE_NANOX
     if (!g_textAtom)
         g_textAtom = XInternAtom( (Display*) wxGetDisplay(), "STRING", FALSE );
     if (!g_pngAtom)
         g_pngAtom = XInternAtom( (Display*) wxGetDisplay(), "image/png", FALSE );
     if (!g_fileAtom)
         g_fileAtom = XInternAtom( (Display*) wxGetDisplay(), "text/uri-list", FALSE );
+#endif
 }
 
 //-------------------------------------------------------------------------

diff --git a/src/x11/popupwin.cpp b/src/x11/popupwin.cpp
index 6f767a6ef66214e1c24716e9f711481f56b07609..818b86fc64f0c8ca32fb6c79dd11f31552fa360a 100644 (file)
--- a/src/x11/popupwin.cpp
+++ b/src/x11/popupwin.cpp
@@ -87,7 +87,10 @@ bool wxPopupWindow::Create( wxWindow *parent, int style )
 
     XSetTransientForHint( xdisplay, xwindow, xparent );
 
-#if !wxUSE_NANOX
+#if wxUSE_NANOX
+    // Switch off WM
+    wxSetWMDecorations(xwindow, 0);
+#else
     XWMHints wm_hints;
     wm_hints.flags = InputHint | StateHint /* | WindowGroupHint */;
     wm_hints.input = True;

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 69a6f46c178211dba22d5ba5c58cb5349002d30f..aeba31a27bfad3a754b3e3581026a063793d397a 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -148,12 +148,44 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     extraFlags |= GR_EVENT_MASK_CLOSE_REQ;
 #endif
 
+#if wxUSE_NANOX
     XSelectInput( xdisplay, xwindow,
-        extraFlags | ExposureMask | KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask |
-        ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask |
-        KeymapStateMask | FocusChangeMask | ColormapChangeMask | StructureNotifyMask |
-        PropertyChangeMask );
-
+                  extraFlags |
+                  ExposureMask |
+                  KeyPressMask |
+                  KeyReleaseMask |
+                  ButtonPressMask |
+                  ButtonReleaseMask |
+                  ButtonMotionMask |
+                  EnterWindowMask |
+                  LeaveWindowMask |
+                  PointerMotionMask |
+                  KeymapStateMask |
+                  FocusChangeMask |
+                  ColormapChangeMask |
+                  StructureNotifyMask |
+                  PropertyChangeMask
+                  );
+#else
+    XSelectInput( xdisplay, xwindow,
+                  extraFlags |
+                  ExposureMask |
+                  KeyPressMask |
+                  KeyReleaseMask |
+                  ButtonPressMask |
+                  ButtonReleaseMask |
+                  ButtonMotionMask |
+                  EnterWindowMask |
+                  LeaveWindowMask |
+                  PointerMotionMask |
+                  KeymapStateMask |
+                  FocusChangeMask |
+                  ColormapChangeMask |
+                  StructureNotifyMask |
+                  PropertyChangeMask
+                  );
+#endif
+    
     wxAddWindowToTable( xwindow, (wxWindow*) this );
 
     // Set background to None which will prevent X11 from clearing the
@@ -189,7 +221,14 @@ bool wxTopLevelWindowX11::Create(wxWindow *parent,
     XSetWMProtocols( xdisplay, xwindow, wm_protocols, 2);
 #endif
     
+#if 0 // wxUSE_NANOX
+    GR_WM_PROPERTIES props;
+    props.flags = GR_WM_FLAGS_TITLE;
+    props.title = (GR_CHAR*) "Hello";
+    GrSetWMProperties(xwindow, &props);
+#else
     wxSetWMDecorations( xwindow, style);
+#endif
 
     SetTitle(title);