Pass width = 0 and height = 0 as unsigned int to indicate the usage of the geometry...

	* lyx_main.C set             width and height to 0
	* frontends/qt3/lyx_gui.C    test on 0
	* frontends/qt4/lyx_gui.C    test on 0

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14235 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt3/lyx_gui.C b/src/frontends/qt3/lyx_gui.C
index b0930f3da15423674c8bc532c972e1d4b407e6d4..83ff15f0ea62a1addb6afcc5b9329468c2baae8b 100644 (file)
--- a/src/frontends/qt3/lyx_gui.C
+++ b/src/frontends/qt3/lyx_gui.C
@@ -247,7 +247,7 @@ void start(string const & batch, vector<string> const & files,
 
        view.init();
 
-       if (width != -1 && height != -1) {
+       if (width != 0 && height != 0) {
                view.initFloatingGeometry(QRect(posx, posy, width, height));
                view.resize(width, height);
                if (posx != -1 && posy != -1)

diff --git a/src/frontends/qt4/lyx_gui.C b/src/frontends/qt4/lyx_gui.C
index 9c74df9a566dfa8ff17e7219b3ae10b5b6531632..176955495009fe2bf909ff79312bd6ed8dacc73a 100644 (file)
--- a/src/frontends/qt4/lyx_gui.C
+++ b/src/frontends/qt4/lyx_gui.C
@@ -211,7 +211,7 @@ void start(string const & batch, vector<string> const & files,
        view.init();
                
        // only true when the -geometry option was NOT used
-       if (width != -1 && height != -1) {
+       if (width != 0 && height != 0) {
                if (posx != -1 && posy != -1) {
 #ifdef Q_OS_WIN32
                        // FIXME: use only setGeoemtry when Trolltech has

diff --git a/src/lyx_main.C b/src/lyx_main.C
index cd9d079844952b4cd60ea288cb38fdadda7f8c72..ab48c7aa67f0e291a57312830ebb93d62d1a2c0f 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -337,8 +337,8 @@ void LyX::exec2(int & argc, char * argv[])
                }
 
                if (geometryOption_) {
-                       width = -1;
-                       height = -1;
+                       width = 0;
+                       height = 0;
                }
 
                lyx_gui::start(batch_command, files, width, height, posx, posy, maximize);