summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index ac60d79..58a64dc 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.133 2003/04/25 11:56:13 fluxgen Exp $ 25// $Id: Screen.cc,v 1.134 2003/04/25 16:07:46 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -673,7 +673,7 @@ BScreen::BScreen(ResourceManager &rm,
673 673
674 if (children[i] == None) continue; 674 if (children[i] == None) continue;
675 675
676 XWMHints *wmhints = XGetWMHints(getBaseDisplay()->getXDisplay(), 676 XWMHints *wmhints = XGetWMHints(FbTk::App::instance()->display(),
677 children[i]); 677 children[i]);
678 678
679 if (wmhints) { 679 if (wmhints) {
@@ -1034,7 +1034,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
1034 return; 1034 return;
1035 1035
1036 if (id != current_workspace->workspaceID()) { 1036 if (id != current_workspace->workspaceID()) {
1037 XSync(BaseDisplay::getXDisplay(), true); 1037 XSync(FbTk::App::instance()->display(), true);
1038 FluxboxWindow *focused = Fluxbox::instance()->getFocusedWindow(); 1038 FluxboxWindow *focused = Fluxbox::instance()->getFocusedWindow();
1039#ifdef DEBUG 1039#ifdef DEBUG
1040 cerr<<__FILE__<<"("<<__FUNCTION__<<"): focused = "<<focused<<endl; 1040 cerr<<__FILE__<<"("<<__FUNCTION__<<"): focused = "<<focused<<endl;
@@ -1101,7 +1101,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
1101 win = Fluxbox::instance()->getFocusedWindow(); 1101 win = Fluxbox::instance()->getFocusedWindow();
1102 1102
1103 if (id != current_workspace->workspaceID()) { 1103 if (id != current_workspace->workspaceID()) {
1104 XSync(BaseDisplay::getXDisplay(), True); 1104 XSync(FbTk::App::instance()->display(), True);
1105 1105
1106 if (win && &win->getScreen() == this && 1106 if (win && &win->getScreen() == this &&
1107 (! win->isStuck())) { 1107 (! win->isStuck())) {