diff options
author | rathnor <rathnor> | 2003-10-28 17:39:59 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2003-10-28 17:39:59 (GMT) |
commit | 7c70b2cd5b7bb0d67f4b5227710e8948c84b86fe (patch) | |
tree | 30519ec57f02741be80b21aff884ff85a3155e1f | |
parent | 811bec8f1d399edc5bc9d90f0c4058bd7bb4afe8 (diff) | |
download | fluxbox-7c70b2cd5b7bb0d67f4b5227710e8948c84b86fe.zip fluxbox-7c70b2cd5b7bb0d67f4b5227710e8948c84b86fe.tar.bz2 |
fix build with --disable-slit
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/Screen.cc | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -1,5 +1,8 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.6: | 2 | Changes for 0.9.6: |
3 | *03/10/28: | ||
4 | * Fix building with --disable-slit (Simon) | ||
5 | Screen.cc | ||
3 | *03/10/27: | 6 | *03/10/27: |
4 | * Change FbWinFrame to NOT reparent client windows into clientarea (Simon) | 7 | * Change FbWinFrame to NOT reparent client windows into clientarea (Simon) |
5 | - fixes (I think) java bug with missing drawing bits of window | 8 | - fixes (I think) java bug with missing drawing bits of window |
diff --git a/src/Screen.cc b/src/Screen.cc index fe5bb25..34173a3 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.238 2003/10/05 06:28:47 rathnor Exp $ | 25 | // $Id: Screen.cc,v 1.239 2003/10/28 17:39:59 rathnor Exp $ |
26 | 26 | ||
27 | 27 | ||
28 | #include "Screen.hh" | 28 | #include "Screen.hh" |
@@ -69,6 +69,9 @@ | |||
69 | 69 | ||
70 | #ifdef SLIT | 70 | #ifdef SLIT |
71 | #include "Slit.hh" | 71 | #include "Slit.hh" |
72 | #else | ||
73 | // fill it in | ||
74 | class Slit {}; | ||
72 | #endif // SLIT | 75 | #endif // SLIT |
73 | 76 | ||
74 | #ifdef STDC_HEADERS | 77 | #ifdef STDC_HEADERS |
@@ -2417,6 +2420,7 @@ int BScreen::getHeadHeight(int head) const { | |||
2417 | // on the actual objects | 2420 | // on the actual objects |
2418 | 2421 | ||
2419 | 2422 | ||
2423 | #ifdef SLIT | ||
2420 | template <> | 2424 | template <> |
2421 | int BScreen::getOnHead<Slit>(Slit &slit) { | 2425 | int BScreen::getOnHead<Slit>(Slit &slit) { |
2422 | return 0; | 2426 | return 0; |
@@ -2427,4 +2431,4 @@ void BScreen::setOnHead<Slit>(Slit &slit, int head) { | |||
2427 | // slit.saveOnHead(head); | 2431 | // slit.saveOnHead(head); |
2428 | slit.reconfigure(); | 2432 | slit.reconfigure(); |
2429 | } | 2433 | } |
2430 | 2434 | #endif // SLIT | |