summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/Button.cc4
-rw-r--r--src/FbTk/FbWindow.cc7
2 files changed, 6 insertions, 5 deletions
diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc
index 4a9063f..acf344b 100644
--- a/src/FbTk/Button.cc
+++ b/src/FbTk/Button.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Button.cc,v 1.4 2003/01/10 02:16:29 fluxgen Exp $ 22// $Id: Button.cc,v 1.5 2003/02/23 16:52:17 fluxgen Exp $
23 23
24#include "Button.hh" 24#include "Button.hh"
25 25
@@ -42,7 +42,7 @@ Button::Button(int screen_num, int x, int y,
42} 42}
43 43
44Button::Button(const FbWindow &parent, int x, int y, 44Button::Button(const FbWindow &parent, int x, int y,
45 size_t width, size_t height): 45 unsigned int width, unsigned int height):
46 m_win(parent, x, y, width, height, 46 m_win(parent, x, y, width, height,
47 ExposureMask | ButtonPressMask | ButtonReleaseMask), 47 ExposureMask | ButtonPressMask | ButtonReleaseMask),
48 m_foreground_pm(0), 48 m_foreground_pm(0),
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index eb91c42..5c0b2d2 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: FbWindow.cc,v 1.6 2003/02/03 13:39:57 fluxgen Exp $ 22// $Id: FbWindow.cc,v 1.7 2003/02/23 16:52:16 fluxgen Exp $
23 23
24#include "FbWindow.hh" 24#include "FbWindow.hh"
25 25
@@ -157,9 +157,10 @@ void FbWindow::updateGeometry() {
157 return; 157 return;
158 158
159 Window root; 159 Window root;
160 size_t border_width, depth; 160 unsigned int border_width, depth;
161 XGetGeometry(s_display, m_window, &root, &m_x, &m_y, 161 XGetGeometry(s_display, m_window, &root, &m_x, &m_y,
162 &m_width, &m_height, &border_width, &depth); 162 (unsigned int *)&m_width, (unsigned int *)&m_height,
163 &border_width, &depth);
163} 164}
164 165
165void FbWindow::create(Window parent, int x, int y, 166void FbWindow::create(Window parent, int x, int y,